diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/dosfstools/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch | 25 | ||||
-rw-r--r-- | extra/git/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/git/fix-git-build-python.patch | 109 | ||||
-rw-r--r-- | extra/re-alpine/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/soundtouch/PKGBUILD | 19 |
6 files changed, 160 insertions, 33 deletions
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index 764b471d0..fbe672432 100644 --- a/extra/dosfstools/PKGBUILD +++ b/extra/dosfstools/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 173425 2012-12-19 14:56:38Z tpowa $ +# $Id: PKGBUILD 174137 2013-01-02 14:44:16Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools pkgver=3.0.13 -pkgrel=1 +pkgrel=2 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) depends=('glibc') #source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz) # using debian source, main page is down since quite some time -source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz) +source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz + dosfstools-3.0.12-fix-alloc-rootdir-entry.patch) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') build() { cd $srcdir/$pkgname-$pkgver + # fix https://bugs.archlinux.org/task/33248 + patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch make } @@ -22,4 +25,5 @@ package () { cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } -md5sums=('c1d851e3fc065a935c7cf919545d239f') +md5sums=('c1d851e3fc065a935c7cf919545d239f' + 'c2be6f2cd1d47297b2d6a8ba237e04eb') diff --git a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch new file mode 100644 index 000000000..44e6e86b5 --- /dev/null +++ b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch @@ -0,0 +1,25 @@ +--- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 ++++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 +@@ -174,7 +174,10 @@ + offset = fs->root_start + next_free * sizeof(DIR_ENT); + memset(de, 0, sizeof(DIR_ENT)); + while (1) { +- sprintf((char *)de->name, pattern, curr_num); ++ char expanded[12]; ++ sprintf(expanded, pattern, curr_num); ++ memcpy(de->name, expanded, 8); ++ memcpy(de->ext, expanded + 8, 3); + for (scan = 0; scan < fs->root_entries; scan++) + if (scan != next_free && + !strncmp((const char *)root[scan].name, +--- dosfstools-3.0.12/src/fat.c ++++ dosfstools-3.0.12/src/fat.c +@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) + DIR_ENT de; + loff_t offset; + files++; +- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); ++ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); + de.start = CT_LE_W(i & 0xffff); + if (fs->fat_bits == 32) + de.starthi = CT_LE_W(i >> 16); diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index e409042f9..e8de55002 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173917 2012-12-28 04:30:01Z dan $ +# $Id: PKGBUILD 174135 2013-01-02 14:21:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.0.3 +pkgver=1.8.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -28,11 +28,13 @@ source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" git-daemon git-daemon.conf git-daemon@.service - git-daemon.socket) + git-daemon.socket + fix-git-build-python.patch) build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" + patch -Np1 < ../fix-git-build-python.patch make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -109,9 +111,10 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('6a32290550c9e8aa55aeb6e8db9c183f' - '962ba4fb286372386c83c3712d1fd59a' +md5sums=('a2c6f4404c5e432b47474d246ca83c7e' + '8da825142aed9f37f80ad67164990373' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' - 'f67869315c2cc112e076f0c73f248002') + 'f67869315c2cc112e076f0c73f248002' + '7fd505fdcd0cd0223e5b8ad641090de8') diff --git a/extra/git/fix-git-build-python.patch b/extra/git/fix-git-build-python.patch new file mode 100644 index 000000000..11618a49a --- /dev/null +++ b/extra/git/fix-git-build-python.patch @@ -0,0 +1,109 @@ +Date: Wed, 2 Jan 2013 03:59:35 -0500
+From: Jeff King <peff@peff.net>
+To: Junio C Hamano <gitster@pobox.com>
+Cc: Dan McGee <dan@archlinux.org>, GIT Mailing-list <git@vger.kernel.org>,
+ Florian Achleitner <florian.achleitner.2.6.31@gmail.com>,
+ David Michael Barr <b@rr-dav.id.au>,
+ "Eric S. Raymond" <esr@thyrsus.com>
+Subject: Re: Test failures with python versions when building git 1.8.1
+Message-ID: <20130102085935.GB9328@sigill.intra.peff.net>
+References: <CAEik5nOqge8ix4WGf-h+0Dmz1CanH_XtQdB-CxvPsggSu1-LzQ@mail.gmail.com>
+ <7va9ss5fhq.fsf@alter.siamese.dyndns.org>
+ <20130102065345.GA8685@sigill.intra.peff.net>
+ <7v1ue459yh.fsf@alter.siamese.dyndns.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+In-Reply-To: <7v1ue459yh.fsf@alter.siamese.dyndns.org>
+
+On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
+
+> Jeff King <peff@peff.net> writes:
+>
+> > [1] This symlink is doubly wrong, because any use of symbolic links
+> > in the test scripts needs to depend on the SYMLINKS prereq, and this
+> > does not.
+>
+> Yeah, I think we have discussed this once already in
+>
+> http://thread.gmane.org/gmane.comp.version-control.git/210688/focus=210714
+
+Thanks for the pointer; it looks like nothing productive came of the
+earlier discussion. To give a hat trick of failure to this line of code,
+I notice that the existing code also does not properly put quotes around
+$GIT_BUILD_DIR.
+
+> > [2] In both the current code and what I showed above, the test scripts
+> > depend on things in contrib/. This is probably a bad idea in
+> > general, as the quality of what goes into contrib is not as closely
+> > watched (especially with respect to things like portability).
+> > Certainly I would not have known to look more carefully at a patch
+> > to contrib/svn-fe for breakage to the test suite.
+>
+> As long as such tests are made skippable with appropriate
+> prerequisites, I do not think it is bad to have their tests in t/; I
+> would say it is rather better than having them in contrib/ and leave
+> it not run by anybody, which happened to some of the stuff in
+> contrib/ already.
+
+Good point. While my sense of decorum wants to keep contrib totally
+split out, from a practical point of view, it is better to have more
+people run the tests and report failures than not.
+
+Whether we end up doing something with contrib and tests or not, the
+patch below gives a minimal fix in the meantime. Dan, does it fix your
+problem?
+
+-- >8 --
+Subject: [PATCH] t9020: don't run python from $PATH
+
+In t9020, we symlink in a python script from contrib to help
+with the testing. However, we don't munge its #!-line, which
+means we may run the wrong python (we want the one in
+PYTHON_PATH). On top of this, we use a symlink without
+checking the SYMLINKS prereq, and we fail to properly quote
+GIT_BUILD_DIR, which may have spaces.
+
+Instead of symlinking, let's just write a small script which
+will feed the contrib script to PYTHON_PATH. To avoid
+quoting issues, we just export the variables the script
+needs to run.
+
+Signed-off-by: Jeff King <peff@peff.net>
+---
+ t/t9020-remote-svn.sh | 5 ++++-
+ t/test-lib.sh | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
+index 4f2dfe0..416623b 100755
+--- a/t/t9020-remote-svn.sh
++++ b/t/t9020-remote-svn.sh
+@@ -14,7 +14,10 @@ export PATH="$HOME:$PATH"
+
+ # We override svnrdump by placing a symlink to the svnrdump-emulator in .
+ export PATH="$HOME:$PATH"
+-ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
++export GIT_BUILD_DIR
++write_script svnrdump <<\EOF
++exec "$PYTHON_PATH" "$GIT_BUILD_DIR"/contrib/svn-fe/svnrdump_sim.py "$@"
++EOF
+
+ init_git () {
+ rm -fr .git &&
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index f50f834..c17db19 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -45,7 +45,7 @@ fi
+ fi
+
+ . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
+-export PERL_PATH SHELL_PATH
++export PERL_PATH SHELL_PATH PYTHON_PATH
+
+ # if --tee was passed, write the output not only to the terminal, but
+ # additionally to the file test-results/$BASENAME.out, too.
+--
+1.8.1.rc3.4.gf3a2f57
+
diff --git a/extra/re-alpine/PKGBUILD b/extra/re-alpine/PKGBUILD index 92043c7a3..bb3ce25ef 100644 --- a/extra/re-alpine/PKGBUILD +++ b/extra/re-alpine/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146303 2012-01-09 01:01:51Z eric $ +# $Id: PKGBUILD 174144 2013-01-03 03:51:33Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Smith Dhumbumroong <zodmaner@gmail.com> pkgname=re-alpine -pkgver=2.02 -pkgrel=3 +pkgver=2.03 +pkgrel=1 pkgdesc="The continuation of the Alpine email client from University of Washington" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/re-alpine/" @@ -12,15 +12,10 @@ license=('APACHE') depends=('libldap' 'krb5') optdepends=('aspell: spell-checking support' 'hunspell: spell-checking support') -provides=('pine' 'alpine') -conflicts=('pine' 'alpine') -replaces=('pine' 'alpine') options=('!makeflags') source=(http://downloads.sourceforge.net/project/re-alpine/${pkgname}-${pkgver}.tar.bz2 maildir.patch) -md5sums=('5e75826b15f05674856be8618bdefdfb' - '8d7a0e8d940e84e978f50266405c7361') -sha1sums=('9c2f13dbc7ca75e7a09f81df607db84694b10fa6' +sha1sums=('8e1c4f4a4d38814478e8bd3bbeed1c0f8ee9491b' 'c09a8e42f9dba3e63a3755a9c418af95da721d8d') build() { diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD index e27054573..40b2c87a4 100644 --- a/extra/soundtouch/PKGBUILD +++ b/extra/soundtouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136036 2011-08-21 23:32:17Z eric $ +# $Id: PKGBUILD 174146 2013-01-03 05:00:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=soundtouch -pkgver=1.6.0 +pkgver=1.7.1 pkgrel=1 pkgdesc="An audio processing library" arch=('i686' 'x86_64') @@ -10,22 +10,13 @@ url="http://www.surina.net/soundtouch/" license=('LGPL') depends=('gcc-libs') options=('!libtool') -source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz - soundtouch-1.4.0-mmx-sse-compile-fix.patch - soundtouch-1.4.0-x86_64-asm-broken.patch) -md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd' - '108cd080b4b0ebe8ed1f950ff1315e7a' - '0d856bb5b519b18c6ba3a2e1770bdfd2') -sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7' - '7a245aacadcb3003e73c1c202c8de0ecc09283ac' - '95282cca856b3b8645fadb530ce5eb892074f193') +source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz) +sha1sums=('8b1a461754853f9c7328571449b7f9b8bd578a89') build() { cd "${srcdir}/${pkgname}" - patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" - patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" - [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic" + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac ./bootstrap ./configure --prefix=/usr --enable-shared ${CONFIGFLAG} make |