upgpkg: vorbis-tools-git r936.134b784-1

2 files changed, 9 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cda3f8752d54..e0d1ca6f52e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
 pkgbase = vorbis-tools-git
 	pkgdesc = Command-line tools for creating and playing Ogg Vorbis files
-	pkgver = r919.b61076d
+	pkgver = r936.134b784
 	pkgrel = 1
-	url = http://www.vorbis.com/
+	url = https://xiph.org/vorbis/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	depends = libvorbis
+	depends = curl
 	depends = flac
+	depends = libvorbis
 	depends = speex
-	depends = curl
 	provides = vorbis-tools
 	conflicts = vorbis-tools
 	source = git+https://git.xiph.org/vorbis-tools.git
-	source = vorbis-tools-CVE-2015-6749.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/vorbis-tools-CVE-2015-6749.patch?h=packages/vorbis-tools
-	source = vorbis-tools-cve9638-cve9639.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/vorbis-tools-cve9638-cve9639.patch?h=packages/vorbis-tools
 	sha256sums = SKIP
-	sha256sums = 52f1d083c16b9caa2bc7bd5315210bac810dd6a0565e4c270650177a4c815fa7
-	sha256sums = 5a6d74de56e67613c4887e3fe9102aadfce4cd4a9a477fb2c1ed1a26f11fdff6
 
 pkgname = vorbis-tools-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fe1e4bd84d9f..760240fb483b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,20 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=vorbis-tools-git
-pkgver=r919.b61076d
+pkgver=r936.134b784
 pkgrel=1
 pkgdesc="Command-line tools for creating and playing Ogg Vorbis files"
 arch=('i686' 'x86_64')
-url="http://www.vorbis.com/"
+url="https://xiph.org/vorbis/"
 license=('GPL')
-depends=('libvorbis' 'flac' 'speex' 'curl')
+depends=('curl' 'flac' 'libvorbis' 'speex')
 makedepends=('git')
 provides=('vorbis-tools')
 conflicts=('vorbis-tools')
-source=("git+https://git.xiph.org/vorbis-tools.git"
-        "vorbis-tools-CVE-2015-6749.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/vorbis-tools-CVE-2015-6749.patch?h=packages/vorbis-tools"
-        "vorbis-tools-cve9638-cve9639.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/vorbis-tools-cve9638-cve9639.patch?h=packages/vorbis-tools")
-sha256sums=('SKIP'
-            '52f1d083c16b9caa2bc7bd5315210bac810dd6a0565e4c270650177a4c815fa7'
-            '5a6d74de56e67613c4887e3fe9102aadfce4cd4a9a477fb2c1ed1a26f11fdff6')
+source=("git+https://git.xiph.org/vorbis-tools.git")
+sha256sums=('SKIP')
 
 
-prepare() {
-  cd "vorbis-tools"
-
-  patch -p1 -i "$srcdir/vorbis-tools-CVE-2015-6749.patch"
-  patch -p1 -i "$srcdir/vorbis-tools-cve9638-cve9639.patch"
-}
-
 pkgver() {
   cd "vorbis-tools"
 
@@ -37,7 +26,6 @@ build() {
 
   ./autogen.sh
   ./configure --prefix="/usr"
-
   make
 }