From e0c1bfae73539aac5627d73dd70a299d274a0c10 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 23 May 2013 01:28:34 -0700 Subject: Thu May 23 01:28:33 PDT 2013 --- libre-testing/libretools/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre-testing') diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 4fe7b534b..4a459ffdc 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -8,8 +8,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130514 -_libretools_commit=b261c8585cf6aa9e7bf5b960b2a0a047d769dbae +pkgver=20130522 +_libretools_commit=379ff751c59d528bd4f1a8e7a24fc039e8e408ba _devtools_commit=89d15e7697da2169493142f78a90b57a784d8f22 _packages_url=https://projects.parabolagnulinux.org/packages @@ -40,7 +40,7 @@ package_libretools() { rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` tokyocabinet # `treepkg` - wget # `aur` and `pkgbuild-check-nonfree` + wget # `aur` and `lib/blacklist.sh` ) optdepends=('namcap: to check package files') @@ -57,5 +57,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('ce2a406d66033b48cacfb580997c1250' +md5sums=('1fac1e8166cc5b686ed3fe6d99588c21' '21d77c519a7496185c40399d1cfa26bf') -- cgit v1.2.3-54-g00ecf From d267e861074512027414df29d18d9824e0faae8f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 May 2013 01:29:52 -0700 Subject: Wed May 29 01:29:24 PDT 2013 --- community/anyfs-tools/PKGBUILD | 16 +- community/checkinstall/PKGBUILD | 10 +- community/checkinstall/build-fix.patch | 2 +- community/chrootuid/PKGBUILD | 10 +- community/dante/PKGBUILD | 7 +- community/dante/sockd.service | 4 +- community/darkhttpd/PKGBUILD | 6 +- community/darkstat/PKGBUILD | 6 +- community/darktable/PKGBUILD | 8 +- community/delegate/PKGBUILD | 16 +- community/delegate/delegate.install | 5 - community/dictd/PKGBUILD | 10 +- community/dictd/dictd.service | 2 +- community/dictd/dictd.xinetd | 2 +- community/fbgetty/PKGBUILD | 10 +- community/flumotion/PKGBUILD | 12 +- community/glusterfs/PKGBUILD | 11 +- community/incron/PKGBUILD | 13 +- community/incron/incron.install | 5 +- community/incron/incrond.service | 2 +- community/inputattach/PKGBUILD | 8 +- community/inputattach/inputattachctl | 2 +- community/ipguard/PKGBUILD | 16 +- community/ipsec-tools/PKGBUILD | 10 +- community/ipsec-tools/ipsec.service | 4 +- community/ipsec-tools/racoon.service | 2 +- community/libaio/PKGBUILD | 23 - community/libdnet/PKGBUILD | 6 +- community/libee/PKGBUILD | 6 +- community/libseccomp/PKGBUILD | 24 - community/libuser/PKGBUILD | 5 +- community/libvirt/PKGBUILD | 14 +- community/osiris/PKGBUILD | 15 +- community/osiris/osirisd.service | 2 +- community/osiris/osirismd.service | 2 +- community/ozerocdoff/PKGBUILD | 11 +- community/p3scan/PKGBUILD | 10 +- community/p3scan/p3scan.service | 4 +- community/pam_mount/PKGBUILD | 9 +- community/pound/PKGBUILD | 10 +- community/pound/pound.runit | 2 +- community/pound/pound.service | 4 +- community/procstatd/PKGBUILD | 10 +- community/qpxtool/PKGBUILD | 6 +- community/sniffit/PKGBUILD | 12 +- community/squashfs-tools/PKGBUILD | 8 +- community/synce-serial/PKGBUILD | 11 +- community/twin/PKGBUILD | 6 +- community/unrealircd/PKGBUILD | 7 +- community/unrealircd/unrealircd.service | 2 +- ...ibfdisk-do-not-use-va_list-in-the-Ask-API.patch | 163 +++++ core/util-linux/PKGBUILD | 7 +- extra/flac/PKGBUILD | 29 +- extra/flac/flac-1.2.1-gcc-4.3-includes.patch | 11 - extra/gssdp/PKGBUILD | 10 +- extra/libaio/PKGBUILD | 24 + extra/libbluray/PKGBUILD | 15 +- extra/libiscsi/PKGBUILD | 30 + extra/libseccomp/PKGBUILD | 24 + extra/libtiff/PKGBUILD | 42 +- extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch | 37 + extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch | 77 +++ extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch | 145 ++++ extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch | 759 +++++++++++++++++++++ extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch | 122 ++++ extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch | 15 + extra/libtorrent-rasterbar/PKGBUILD | 8 +- extra/openconnect/PKGBUILD | 13 +- extra/p11-kit/PKGBUILD | 6 +- extra/telepathy-idle/PKGBUILD | 6 +- extra/telepathy-mission-control/PKGBUILD | 6 +- libre-testing/libretools/PKGBUILD | 26 +- libre-testing/ronn/PKGBUILD | 32 + libre-testing/ruby-hpricot/PKGBUILD | 25 + libre-testing/ruby-mustache/PKGBUILD | 31 + libre-testing/ruby-rdiscount/PKGBUILD | 38 ++ libre-testing/sh-roundup/PKGBUILD | 44 ++ libre-testing/sh-roundup/makefile-fix.patch | 11 + pcr/jitsi/PKGBUILD | 70 +- pcr/jitsi/drop-open-term-on-index-jn-html.patch | 6 + 80 files changed, 1943 insertions(+), 297 deletions(-) delete mode 100644 community/libaio/PKGBUILD delete mode 100644 community/libseccomp/PKGBUILD create mode 100644 core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch delete mode 100644 extra/flac/flac-1.2.1-gcc-4.3-includes.patch create mode 100644 extra/libaio/PKGBUILD create mode 100644 extra/libiscsi/PKGBUILD create mode 100644 extra/libseccomp/PKGBUILD create mode 100644 extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch create mode 100644 extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch create mode 100644 extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch create mode 100644 extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch create mode 100644 extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch create mode 100644 extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch create mode 100644 libre-testing/ronn/PKGBUILD create mode 100644 libre-testing/ruby-hpricot/PKGBUILD create mode 100644 libre-testing/ruby-mustache/PKGBUILD create mode 100644 libre-testing/ruby-rdiscount/PKGBUILD create mode 100644 libre-testing/sh-roundup/PKGBUILD create mode 100644 libre-testing/sh-roundup/makefile-fix.patch create mode 100644 pcr/jitsi/drop-open-term-on-index-jn-html.patch (limited to 'libre-testing') diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD index f0ff30bf5..d88e91149 100644 --- a/community/anyfs-tools/PKGBUILD +++ b/community/anyfs-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66269 2012-02-23 06:54:24Z spupykin $ +# $Id: PKGBUILD 91828 2013-05-28 17:03:05Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=anyfs-tools pkgver=0.85.1c -pkgrel=3 +pkgrel=4 pkgdesc="unix-way toolset for recovering and converting filesystems" arch=('i686' 'x86_64') url="http://anyfs-tools.sourceforge.net/" @@ -17,6 +17,11 @@ source=(http://downloads.sourceforge.net/sourceforge/anyfs-tools/${pkgname}-${pk md5sums=('d3da0004cd0f037ec3e926acd3f520c2' '5ea91297b605d51b03243adda1efed27') +prepare() { + cd $srcdir/$pkgname-${pkgver} + find . -name Makefile.in -exec sed -i 's|$(INSTALLPATH)/sbin|$(INSTALLPATH)/bin|g' {} \; +} + build() { cd $srcdir/$pkgname-${pkgver} @@ -25,8 +30,13 @@ build() { patch -p1 <$srcdir/disable-build-ext2fs.patch #Dirty Arch64 fix which doesn't affect i686 - CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" ./configure --prefix=/usr --build=i686-linux-gnu + CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" \ + ./configure --prefix=/usr --build=i686-linux-gnu make -j1 sed -i 's|ldconfig||' src/anysurrect/Makefile +} + +package() { + cd $srcdir/$pkgname-${pkgver} make INSTALLPATH=$pkgdir/usr install } diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD index f5bebd03e..31f879e1c 100644 --- a/community/checkinstall/PKGBUILD +++ b/community/checkinstall/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65086 2012-02-20 03:34:38Z spupykin $ +# $Id: PKGBUILD 91846 2013-05-28 17:24:53Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=checkinstall pkgver=1.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="spy for 'make install' and build rpm or deb" arch=('i686' 'x86_64') url="http://asic-linux.com.mx/~izto/checkinstall/" @@ -13,11 +13,15 @@ backup=(etc/checkinstall/checkinstallrc) source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('d7b43c92001e68243a93bcce8b1e5480' - '5c68cb7e29cf6da4b845ce57fb5ea080') + 'eac0c843781c300e7bc15c55be262e51') build() { cd $srcdir/$pkgname-$pkgver patch -Np1 <../build-fix.patch make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/checkinstall/build-fix.patch b/community/checkinstall/build-fix.patch index 341b7dfca..9ab00cde5 100644 --- a/community/checkinstall/build-fix.patch +++ b/community/checkinstall/build-fix.patch @@ -134,7 +134,7 @@ diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile -LCDIR=$(PREFIX)/lib/checkinstall/locale -CONFDIR=$(PREFIX)/lib/checkinstall +PREFIX=/usr -+BINDIR=$(DESTDIR)/$(PREFIX)/sbin ++BINDIR=$(DESTDIR)/$(PREFIX)/bin +LCDIR=$(DESTDIR)/$(PREFIX)/share/locale +CONFDIR=$(DESTDIR)/etc/checkinstall diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD index 21bd8e3f0..9b6f9a7ee 100644 --- a/community/chrootuid/PKGBUILD +++ b/community/chrootuid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65090 2012-02-20 03:36:03Z spupykin $ +# $Id: PKGBUILD 91848 2013-05-28 17:25:14Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Frop Doe # Contributor: Guillermo A. Amaral (thewonka) @@ -6,7 +6,7 @@ pkgname=chrootuid pkgver=1.3 -pkgrel=5 +pkgrel=6 arch=(i686 x86_64) pkgdesc="Runs a command in a restricted environment." url="ftp://ftp.porcupine.org/pub/security/index.html" @@ -20,7 +20,11 @@ md5sums=('15510abadf5de189e1c22a1544dc926a' build() { cd $srcdir/$pkgname$pkgver make - install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/sbin/chrootuid +} + +package() { + cd $srcdir/$pkgname$pkgver + install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/bin/chrootuid install -D -m644 $srcdir/$pkgname$pkgver/chrootuid.1 $pkgdir/usr/share/man/man1/chrootuid.1 install -D -m644 $srcdir/chrootuid_license $pkgdir/usr/share/licenses/$pkgname/license } diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index b6fe2544f..094e95b38 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90649 2013-05-13 14:18:47Z spupykin $ +# $Id: PKGBUILD 91850 2013-05-28 17:25:33Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Guillem Rieu pkgname=dante pkgver=1.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64) @@ -16,11 +16,12 @@ options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' - 'ceb86b5bd97f7e3ceff28c6e6172a25b') + '9bb18a0165764092bd01da0ff6303fbf') build() { cd ${srcdir}/${pkgname}-${pkgver} [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ --disable-libwrap make } diff --git a/community/dante/sockd.service b/community/dante/sockd.service index a2a964304..68201577a 100644 --- a/community/dante/sockd.service +++ b/community/dante/sockd.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking EnvironmentFile=/etc/conf.d/sockd.conf -PIDFile=/var/run/sockd.pid -ExecStart=/usr/sbin/sockd $SOCKD_OPTS +PIDFile=/run/sockd.pid +ExecStart=/usr/bin/sockd $SOCKD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD index 525cdccb8..d6c7f1f84 100644 --- a/community/darkhttpd/PKGBUILD +++ b/community/darkhttpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89410 2013-04-29 10:56:40Z spupykin $ +# $Id: PKGBUILD 91852 2013-05-28 17:25:58Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta pkgname=darkhttpd pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A small, static webserver" arch=('i686' 'x86_64') url="http://dmr.ath.cx/net/darkhttpd/" @@ -20,7 +20,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/sbin/darkhttpd + install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/bin/darkhttpd mkdir -p $pkgdir/usr/share/licenses/$pkgname head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license } diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index 4ef26c787..52526ad81 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90651 2013-05-13 14:19:19Z spupykin $ +# $Id: PKGBUILD 91854 2013-05-28 17:26:25Z spupykin $ # Maintainer: Sergej Pupykin pkgname=darkstat pkgver=3.0.715 -pkgrel=9 +pkgrel=10 pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") @@ -20,7 +20,7 @@ md5sums=('5b7abc7538dcd8e30667dac150e81d77' build() { cd $srcdir/darkstat-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index bd7e3a97c..5868dbd20 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90013 2013-05-06 19:36:35Z foutrelis $ +# $Id: PKGBUILD 91822 2013-05-28 13:42:16Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika pkgname=darktable -pkgver=1.2 +pkgver=1.2.1 _pkgver=1.2 -pkgrel=4 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('31bfd13d4786aac4f99d5155a811602b') +md5sums=('f970573777752b1b4447997d1f1f65fa') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD index 7fbf1b030..e9b4f9a87 100644 --- a/community/delegate/PKGBUILD +++ b/community/delegate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65112 2012-02-20 04:49:31Z spupykin $ +# $Id: PKGBUILD 91876 2013-05-28 17:59:23Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=delegate pkgver=9.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface" arch=('i686' 'x86_64') url="http://www.delegate.org/" @@ -18,13 +18,17 @@ md5sums=('86c833e95cd16a54d54fa3c7e4ab7929') build() { cd $srcdir/$pkgname$pkgver make ADMIN="root@localhost" +} + +package() { + cd $srcdir/$pkgname$pkgver install -D -m0755 src/delegated $pkgdir/usr/bin/delegated - install -D -m0755 subin/dgbind $pkgdir/usr/sbin/dgbind - install -D -m0755 subin/dgchroot $pkgdir/usr/sbin/dgchroot - install -D -m0755 subin/dgcpnod $pkgdir/usr/sbin/dgcpnod - install -D -m0755 subin/dgpam $pkgdir/usr/sbin/dgpam + install -D -m0755 subin/dgbind $pkgdir/usr/bin/dgbind + install -D -m0755 subin/dgchroot $pkgdir/usr/bin/dgchroot + install -D -m0755 subin/dgcpnod $pkgdir/usr/bin/dgcpnod + install -D -m0755 subin/dgpam $pkgdir/usr/bin/dgpam install -D -m0644 doc/Manual.htm $pkgdir/usr/share/delegate/manual.htm install -D -m0644 doc/tutor-en.htm $pkgdir/usr/share/delegate/tutor-en.htm diff --git a/community/delegate/delegate.install b/community/delegate/delegate.install index f7c7096b4..39883a261 100644 --- a/community/delegate/delegate.install +++ b/community/delegate/delegate.install @@ -1,11 +1,6 @@ -pre_install() { - /bin/true -} - post_install() { echo "--" echo "-- Delegate supports too many protocols, so I did not write any rc-script" echo "-- Please read documentation in /usr/share/delegate/" echo "--" - /bin/true } diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 80c5edc16..cd5509161 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90655 2013-05-13 14:21:09Z spupykin $ +# $Id: PKGBUILD 91830 2013-05-28 17:03:45Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: SmackleFunky # Contributor: Enrico Morelli pkgname=dictd pkgver=1.12.1 -pkgrel=2 +pkgrel=3 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" license=('GPL') @@ -31,14 +31,14 @@ md5sums=('62696491174c22079f664830d07c0623' 'fb72f7d8c55f84b1b37bbc8d33a8e55a' '64cd6ffdb40fb3367224f91ac44926ac' '838887fee38ae4cebd652d399b1f2266' - '574e316d1f08885882d7b3075e1ea522' + 'd94fa6c43514c158c80e85f856c65365' 'b8cabf913876e544d919c7f20ff8db9e' - 'b7dbc9529df13ff895dae2b4abd080d6' + 'bd3fd3f68625bad0c23754686ae2e99c' '978c9c079a0fc8d7d42a4cd4000190e7') build() { cd $srcdir/$pkgname-$pkgver - ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict + ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict --sbindir=/usr/bin make } diff --git a/community/dictd/dictd.service b/community/dictd/dictd.service index fa219f72a..f62bf275f 100644 --- a/community/dictd/dictd.service +++ b/community/dictd/dictd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking EnvironmentFile=-/etc/conf.d/dictd -ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS +ExecStart=/usr/bin/dictd $DICTD_ARGS -- $DICTD_EARGS [Install] WantedBy=multi-user.target diff --git a/community/dictd/dictd.xinetd b/community/dictd/dictd.xinetd index a3e3773dc..0ae5cb411 100644 --- a/community/dictd/dictd.xinetd +++ b/community/dictd/dictd.xinetd @@ -7,6 +7,6 @@ service dict protocol = tcp wait = no user = daemon - server = /usr/sbin/dictd + server = /usr/bin/dictd server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8 } diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD index ee251e138..77cc00f8e 100644 --- a/community/fbgetty/PKGBUILD +++ b/community/fbgetty/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65233 2012-02-20 12:23:20Z spupykin $ +# $Id: PKGBUILD 91856 2013-05-28 17:26:45Z spupykin $ # Maintainer: Sergej Pupykin pkgname=fbgetty pkgver=0.1.698 -pkgrel=4 +pkgrel=5 license=("GPL") pkgdesc="fbgetty is a console getty like mingetty, which supports framebuffers" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin patch src/options.c < # Contributor: Geoffroy Carrier # Contributor: William Rea pkgname=flumotion pkgver=0.10.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="A streaming media server" url="http://www.flumotion.net" @@ -29,10 +29,14 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin - install -d "$pkgdir/etc/$pkgname" make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir/etc/$pkgname" make DESTDIR="$pkgdir" install cp -R conf/workers "$pkgdir/etc/$pkgname" cp -R conf/managers "$pkgdir/etc/$pkgname" diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index 656fc7597..82100d9ab 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90667 2013-05-13 14:24:32Z spupykin $ +# $Id: PKGBUILD 91880 2013-05-28 18:08:16Z spupykin $ # Maintainer: Sergej Pupykin # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be @@ -7,7 +7,7 @@ pkgname=glusterfs _basever=3.3 pkgver=$_basever.1 -pkgrel=2 +pkgrel=3 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' @@ -17,12 +17,6 @@ makedepends=(flex bison) options=(!libtool) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz glusterd.service) -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') @@ -31,6 +25,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/share/man \ diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 21370d6af..1324e7b0a 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90677 2013-05-13 14:26:58Z spupykin $ +# $Id: PKGBUILD 91858 2013-05-28 17:27:08Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Roberto Alsina # Contributor: scj pkgname=incron pkgver=0.5.10 -pkgrel=4 +pkgrel=5 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64') url="http://incron.aiken.cz/" @@ -16,13 +16,18 @@ options=('emptydirs') source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" 'incrond.service') md5sums=('67f8b671db8169edccc8ef11c7d2c8be' - '859a90af9e4efe40db381ea07167a66a') + '4be206ba6ecacd9d2006cdc72b4604db') -build() { +prepare() { cd "${srcdir}"/$pkgname-$pkgver sed -i '1,1i#include ' inotify-cxx.cpp icd-main.cpp sed -i '1,1i#include ' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp + sed -i 's|$(DESTDIR)$(PREFIX)/sbin/|$(DESTDIR)$(PREFIX)/bin/|g' Makefile +} + +build() { + cd "${srcdir}"/$pkgname-$pkgver make } diff --git a/community/incron/incron.install b/community/incron/incron.install index fa42d9cdc..9cb53bbe6 100644 --- a/community/incron/incron.install +++ b/community/incron/incron.install @@ -8,7 +8,6 @@ post_install () { pre_remove() { [ -h /var/service/incron ] && rm /var/service/incron - /etc/rc.d/incron stop - usr/sbin/userdel incron >& /dev/null - usr/sbin/groupdel incron >& /dev/null + userdel incron >& /dev/null + groupdel incron >& /dev/null } diff --git a/community/incron/incrond.service b/community/incron/incrond.service index 54fcfa9d2..d46814bf3 100644 --- a/community/incron/incrond.service +++ b/community/incron/incrond.service @@ -4,7 +4,7 @@ Description=Inotify System Scheduler [Service] Type=forking PIDFile=/run/incrond.pid -ExecStart=/usr/sbin/incrond +ExecStart=/usr/bin/incrond [Install] WantedBy=multi-user.target diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD index 802c1a5f6..bda613cf0 100644 --- a/community/inputattach/PKGBUILD +++ b/community/inputattach/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90759 2013-05-13 16:35:21Z spupykin $ +# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Mark Smith pkgname=inputattach pkgver=1.24 -pkgrel=9 +pkgrel=10 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system" arch=('i686' 'x86_64') url="http://linuxconsole.sourceforge.net/" @@ -23,7 +23,7 @@ md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a' '7ca903e54829764c8241233af5069216' 'c19b9ed38b243191cf5378b87a42a4cc' - '84c6463660c10bd34c0390102da087d5' + '7dd0690a9d2fe5e1052900650906e273' 'f1b3ddae308351357f557cbd5c6cda81' '8f76908449cae24a95adbf0bc0a17721') @@ -43,7 +43,7 @@ build() { package() { cd "$srcdir/src" - install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach" + install -Dm755 inputattach "$pkgdir/usr/bin/inputattach" install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl index 291c531ae..05dfa4af5 100755 --- a/community/inputattach/inputattachctl +++ b/community/inputattach/inputattachctl @@ -5,7 +5,7 @@ case "$1" in start) for i in "${IAPARAMS[@]}"; do - /usr/sbin/inputattach --daemon $i || exit 1 + /usr/bin/inputattach --daemon $i || exit 1 done ;; stop) diff --git a/community/ipguard/PKGBUILD b/community/ipguard/PKGBUILD index f8fa6796a..691be3d32 100644 --- a/community/ipguard/PKGBUILD +++ b/community/ipguard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65572 2012-02-21 09:01:48Z spupykin $ +# $Id: PKGBUILD 91832 2013-05-28 17:04:05Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=ipguard pkgver=1.04 -pkgrel=2 +pkgrel=3 pkgdesc="ipguard - arp<->ip relation checking tool" arch=(i686 x86_64) url="http://ipguard.deep.perm.ru/" @@ -15,14 +15,20 @@ source=(http://ipguard.deep.perm.ru/files/$pkgname-$pkgver.tar.gz md5sums=('7f44f7c31876f0d68792f02047e25409' 'b27cfc9e8ad4ef9459d7274a2e624831') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver - patch -Np1 <../build-fix-le.patch + sed -i 's|$(PREFIX)/sbin|$(PREFIX)/bin|g' Makefile +} +build() { + cd $srcdir/$pkgname-$pkgver CFLAGS="-DLIBNET_LIL_ENDIAN" make - make PREFIX=$pkgdir/usr install +} +package() { + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr install mkdir -p $pkgdir/usr/share mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index a5683ebc4..16bf75bdf 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90745 2013-05-13 14:45:21Z spupykin $ +# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Allan Henriksen pkgname=ipsec-tools pkgver=0.8.1 -pkgrel=2 +pkgrel=4 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') url="http://ipsec-tools.sourceforge.net/" @@ -17,8 +17,8 @@ source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgve ipsec.service ipsec-tools-linux-3.7-compat.patch) md5sums=('d38b39f291ba2962387c3232e7335dd8' - '1632fce55ba5592dea1f8bf661106e7d' - '5bf7478590c751b465617681a31619fe' + '3a64a9e3b498c6da90450ffb0b758aea' + '387a0b0c4f10e42b2bb62282885cdc9c' 'ae1dd20c83dcfce3dedb46ee73e83613') build() { @@ -28,7 +28,7 @@ build() { sed -i 's#-Werror##' configure.ac ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ --enable-adminport --enable-gssapi \ --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service index 3a6dea38b..483a5b58d 100644 --- a/community/ipsec-tools/ipsec.service +++ b/community/ipsec-tools/ipsec.service @@ -5,8 +5,8 @@ After=syslog.target network.target [Service] Type=oneshot RemainAfterExit=true -ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf -ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F +ExecStart=/usr/bin/setkey -f /etc/ipsec.conf +ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F [Install] WantedBy=multi-user.target diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service index 792cfd395..95324bd5d 100644 --- a/community/ipsec-tools/racoon.service +++ b/community/ipsec-tools/racoon.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -ExecStart=/usr/sbin/racoon +ExecStart=/usr/bin/racoon [Install] WantedBy=multi-user.target diff --git a/community/libaio/PKGBUILD b/community/libaio/PKGBUILD deleted file mode 100644 index 717473564..000000000 --- a/community/libaio/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer: Bartłomiej Piotrowski -# Contributor: Thomas S Hatch - -pkgname=libaio -pkgver=0.3.109 -pkgrel=6 -pkgdesc="The Linux-native asynchronous I/O facility (aio) library" -arch=('i686' 'x86_64') -url="http://lse.sourceforge.net/io/aio.html" -license=('LGPL') -source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz) -md5sums=('435a5b16ca6198eaf01155263d855756') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make prefix="$pkgdir/usr" install -} - diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index 3c4c0f057..d12544eef 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $ +# $Id: PKGBUILD 91834 2013-05-28 17:04:24Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: James Fryman pkgname=libdnet pkgver=1.12 -pkgrel=6 +pkgrel=7 pkgdesc="A simplified, portable interface to several low-level networking routines" arch=(i686 x86_64) makedepends=(python2) @@ -19,7 +19,7 @@ build() { cd $srcdir/$pkgname-$pkgver autoreconf -I config --force --install - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD index 147342e9d..f2dd94444 100644 --- a/community/libee/PKGBUILD +++ b/community/libee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80464 2012-11-22 10:27:21Z spupykin $ +# $Id: PKGBUILD 91836 2013-05-28 17:04:46Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Brian Knox pkgname=libee pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="event expression library inspired by CEE" url="http://www.libee.org/" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ md5sums=('7bbf4160876c12db6193c06e2badedb2') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make -j1 } diff --git a/community/libseccomp/PKGBUILD b/community/libseccomp/PKGBUILD deleted file mode 100644 index 9bdaee4fc..000000000 --- a/community/libseccomp/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Daniel Micay -# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws> - -pkgname=libseccomp -pkgver=2.0.0 -pkgrel=2 -pkgdesc='Enhanced seccomp library' -arch=('i686' 'x86_64') -license=('LGPL2.1') -url="http://sourceforge.net/projects/libseccomp/" -depends=('glibc') -source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('f988feac6a3425f2c918f32b28df1caa') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD index 127f5d907..ff830f669 100644 --- a/community/libuser/PKGBUILD +++ b/community/libuser/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88522 2013-04-19 10:31:27Z spupykin $ +# $Id: PKGBUILD 91838 2013-05-28 17:05:08Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Thomas Dziedzic < gostrc at gmail > pkgname=libuser pkgver=0.59 -pkgrel=1 +pkgrel=2 pkgdesc='A standardized interface for manipulating and administering user and group accounts.' arch=('i686' 'x86_64') license=('LGPL') @@ -21,6 +21,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --disable-gtk-doc-html \ --disable-rpath sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 608e854b9..6b6ba9bad 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90887 2013-05-15 08:03:43Z bpiotrowski $ +# $Id: PKGBUILD 91813 2013-05-28 11:39:01Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -55,15 +55,11 @@ build() { --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd --with-audit \ --with-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface + --without-netcf --with-interface \ + --with-dnsmasq-path=/usr/bin/dnsmasq make - sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service - sed -i \ - -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \ - -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \ - -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \ - tools/libvirt-guests.service + sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf } diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index f8199ecbd..163ed50ab 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90697 2013-05-13 14:32:32Z spupykin $ +# $Id: PKGBUILD 91866 2013-05-28 17:38:40Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: jlvsimoes pkgname=osiris pkgver=4.2.3 -pkgrel=6 +pkgrel=7 pkgdesc="A file integrity management system" arch=('i686' 'x86_64') url="http://osiris.shmoo.com/" @@ -16,13 +16,16 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz osirismd.service osirisd.service) md5sums=('1951c7dc0fe729af9ffaf58910340d12' - '48644676b88b231803785b8e2da956e5' - 'c0355b453770f6bbc6a58f5cd80766b4') + '8398d60bcbf0c90034473365abc3ece6' + '758d029a1ff53be11756330de595e77f') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname + sed -i "s|/sbin|/bin|g" src/install/install.sh.in + + ./configure --prefix=/usr --sbindir=/usr/bin \ + --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname make all # Arch-ify install locations @@ -39,7 +42,7 @@ package() { make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/osiris + rm -rf $pkgdir/usr/osiris $pkgdir/etc/init.d install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service index 199737c9f..3b162160f 100644 --- a/community/osiris/osirisd.service +++ b/community/osiris/osirisd.service @@ -4,7 +4,7 @@ Description=A file integrity management system [Service] User=osiris Type=forking -ExecStart=/usr/sbin/osirisd +ExecStart=/usr/bin/osirisd [Install] WantedBy=multi-user.target diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service index d51cef22c..ec4c40702 100644 --- a/community/osiris/osirismd.service +++ b/community/osiris/osirismd.service @@ -4,7 +4,7 @@ Description=A file integrity management system [Service] User=osiris Type=forking -ExecStart=/usr/sbin/osirismd +ExecStart=/usr/bin/osirismd [Install] WantedBy=multi-user.target diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD index 309d9d413..aa5cb4031 100644 --- a/community/ozerocdoff/PKGBUILD +++ b/community/ozerocdoff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69167 2012-04-09 22:11:35Z spupykin $ +# $Id: PKGBUILD 91884 2013-05-28 18:09:59Z spupykin $ # Maintainer: Geoffroy Carrier pkgname=ozerocdoff pkgver=2 -pkgrel=7 +pkgrel=8 pkgdesc="Userspace driver for Option High Speed Mobile Devices" arch=('i686' 'x86_64') url="http://www.pharscape.org/ozerocdoff.html" @@ -15,10 +15,15 @@ source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;t md5sums=('88a78f9380d9591f8d20a657b72e3e5c' '28ed1afd16fdec92de3baf66b32b0b12') +prepare() { + cd "${srcdir}/udev" + patch -p1 <$srcdir/remove-old-rules.patch + sed -i 's|usr/sbin|usr/bin|g' Makefile +} + build() { cd "${srcdir}/udev" make clean - patch -p1 <$srcdir/remove-old-rules.patch make } diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index 92190ab71..17039ff9b 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90699 2013-05-13 14:33:03Z spupykin $ +# $Id: PKGBUILD 91863 2013-05-28 17:37:47Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: v01d pkgname=p3scan pkgver=2.3.2 -pkgrel=8 +pkgrel=9 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection" arch=('i686' 'x86_64') url="http://p3scan.sourceforge.net/" @@ -15,7 +15,7 @@ source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver. "p3scan.service" "p3scan.tmpfiles") md5sums=('9f8decc7d4701228788e3c8717096ca0' - 'dc724b50963d80be7924fc4d9d4856f0' + '74a3a5e52e6714ac5001985061248a34' '265a730e20e3d8aaf0cd7816dc98ca71') build() { @@ -25,7 +25,7 @@ build() { unset CFLAGS sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile - sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile + sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/bin/|' Makefile make } @@ -33,7 +33,7 @@ package() { cd $srcdir/$pkgname-$pkgver # Create base dirs, the Makefile assumes they're there - install -d $pkgdir/usr/sbin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d + install -d $pkgdir/usr/bin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d # install with root set on $pkgdir make DESTDIR=$pkgdir install diff --git a/community/p3scan/p3scan.service b/community/p3scan/p3scan.service index 0bab3e7ec..bdd34b75c 100644 --- a/community/p3scan/p3scan.service +++ b/community/p3scan/p3scan.service @@ -3,8 +3,8 @@ Description=p3scan proxy [Service] Type=forking -PIDFile=/var/run/p3scan/p3scan.pid -ExecStart=/usr/sbin/p3scan +PIDFile=/run/p3scan/p3scan.pid +ExecStart=/usr/bin/p3scan [Install] WantedBy=multi-user.target diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD index d652fe0c3..fb054c78f 100644 --- a/community/pam_mount/PKGBUILD +++ b/community/pam_mount/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77500 2012-10-11 11:40:42Z spupykin $ +# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $ # Maintainer: Sergej Pupykin # Contributors: Sirius Bakke pkgname=pam_mount pkgver=2.13 -pkgrel=4 +pkgrel=5 pkgdesc="A PAM module that can mount volumes for a user session" arch=('i686' 'x86_64') url="http://pam-mount.sourceforge.net/" @@ -22,12 +22,13 @@ build() { cd -- "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/$pkgname-git.patch aclocal - automake --add-missing libtoolize + automake --add-missing autoreconf ./configure \ --prefix=/usr \ - --with-ssbindir=/usr/sbin \ + --with-ssbindir=/usr/bin \ + --sbindir=/usr/bin \ --with-slibdir=/usr/lib \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 90ac79303..efeee6ce8 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90705 2013-05-13 14:34:19Z spupykin $ +# $Id: PKGBUILD 91868 2013-05-28 17:43:52Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Douglas Soares de Andrade # Contributor: Roberto Alsina pkgname=pound pkgver=2.6 -pkgrel=4 +pkgrel=5 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64') url="http://www.apsis.ch/pound/index_html" @@ -17,13 +17,13 @@ source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.service pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' - '4bd5e2a8d8e707eb900ae88929e00d4c' - '23c70776fcd1cf71572f90a8809f7408' + '2a555ee5871a849cb1f6e6ba2ff054df' + 'c0d0726a96dfda0e83843362e401b3dc' '8937808acd22c6391ebe4340af8df854') build() { cd $srcdir/Pound-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/pound + ./configure --prefix=/usr --sysconfdir=/etc/pound --sbindir=/usr/bin make } diff --git a/community/pound/pound.runit b/community/pound/pound.runit index ed59ea046..ae904583c 100644 --- a/community/pound/pound.runit +++ b/community/pound/pound.runit @@ -4,7 +4,7 @@ exec 2>&1 . /etc/rc.conf . /etc/rc.d/functions -BIN=/usr/sbin/pound +BIN=/usr/bin/pound OPTS="-f /etc/pound/pound.cfg -p /var/run/pound.pid" SVC=pound diff --git a/community/pound/pound.service b/community/pound/pound.service index 0a91f3424..5ec089c9a 100644 --- a/community/pound/pound.service +++ b/community/pound/pound.service @@ -3,8 +3,8 @@ Description=A reverse proxy, load balancer, and SSL wrapper [Service] Type=forking -PIDFile=/var/run/pound.pid -ExecStart=/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid +PIDFile=/run/pound.pid +ExecStart=/usr/bin/pound -f /etc/pound/pound.cfg -p /run/pound.pid [Install] WantedBy=multi-user.target diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD index 47fce0127..d72ce0b15 100644 --- a/community/procstatd/PKGBUILD +++ b/community/procstatd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66164 2012-02-23 02:23:03Z spupykin $ +# $Id: PKGBUILD 91870 2013-05-28 17:44:13Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Tom Newsom # Maintainer: Jason Chu pkgname=procstatd pkgver=1.4.2 -pkgrel=6 +pkgrel=8 pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc" arch=('i686 x86_64') license=('GPL') @@ -17,8 +17,12 @@ md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') build() { cd $srcdir/$pkgname # Get rid of the funky make install forever bug - sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile + sed -i 's/make install/echo/;s/cd watchman/echo/;s@$(INSTDIR)/sbin@$(INSTDIR)/bin@' Makefile make +} + +package() { + cd $srcdir/$pkgname make INSTDIR=$pkgdir/usr install mkdir ${pkgdir}/usr/share mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD index 565af8113..a3d0b2f9f 100644 --- a/community/qpxtool/PKGBUILD +++ b/community/qpxtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90084 2013-05-06 19:39:19Z foutrelis $ +# $Id: PKGBUILD 91840 2013-05-28 17:05:29Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Krzysztof Stasiorowski pkgname=qpxtool pkgver=0.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." arch=('i686' 'x86_64') url="http://qpxtool.sourceforge.net/" @@ -24,7 +24,7 @@ build() { -e 's|lrelease|lrelease-qt4|' \ configure patch -p1 <$srcdir/libpng15.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD index 4843eb7cc..b3f38f95b 100644 --- a/community/sniffit/PKGBUILD +++ b/community/sniffit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65453 2012-02-21 05:52:41Z spupykin $ +# $Id: PKGBUILD 91886 2013-05-28 18:10:20Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Kessia 'even' Pinheiro pkgname=sniffit pkgver=0.3.7.beta -pkgrel=11 -pkgdesc="very good packet sniffer for unix with ncurses interactive mode." +pkgrel=12 +pkgdesc="Very good packet sniffer for unix with ncurses interactive mode" arch=('i686' 'x86_64') url="http://packages.ubuntu.com/source/sniffit" #seems the website are out, ubuntu have all sources @@ -27,8 +27,12 @@ build() { rm -f config.sub config.guess cp /usr/share/libtool/config/config.{guess,sub} . - ./configure --prefix=/usr --no-recursion + ./configure --prefix=/usr --no-recursion --sbindir=/usr/bin make +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" install -d -m0755 -g root -o root ${pkgdir}/usr/{sbin,share/licenses/${pkgname}} install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/sbin/sniffit install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname} diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD index ddbf5df79..b9ce14244 100644 --- a/community/squashfs-tools/PKGBUILD +++ b/community/squashfs-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65461 2012-02-21 05:55:21Z spupykin $ +# $Id: PKGBUILD 91872 2013-05-28 17:44:34Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Aaron Griffin # Original TU: Jeff Mickey @@ -6,7 +6,7 @@ pkgname=squashfs-tools pkgver=4.2 -pkgrel=2 +pkgrel=3 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux." url="http://squashfs.sourceforge.net" license=("GPL") @@ -24,6 +24,6 @@ build() { package() { cd ${srcdir}/squashfs${pkgver}/${pkgname} - install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs - install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs + install -Dm755 mksquashfs ${pkgdir}/bin/mksquashfs + install -m755 unsquashfs ${pkgdir}/bin/unsquashfs } diff --git a/community/synce-serial/PKGBUILD b/community/synce-serial/PKGBUILD index 485ca054d..f89a77018 100644 --- a/community/synce-serial/PKGBUILD +++ b/community/synce-serial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65481 2012-02-21 06:01:39Z spupykin $ +# $Id: PKGBUILD 91842 2013-05-28 17:05:51Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Zhukov Pavel pkgname=synce-serial pkgver=0.11 -pkgrel=4 +pkgrel=5 pkgdesc="provide a means of communication with a Windows CE device - helper scripts for setting up a serial connection" arch=('i686' 'x86_64') url="http://synce.sourceforge.net/" @@ -15,10 +15,13 @@ md5sums=('a83f20eb59c845de192645158d051062') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sbindir=/usr/bin make - make DESTDIR=$pkgdir install +} +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial-common sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial.conf } diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD index 39725c602..6abb8de4f 100644 --- a/community/twin/PKGBUILD +++ b/community/twin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70178 2012-05-01 12:01:36Z andrea $ +# $Id: PKGBUILD 91844 2013-05-28 17:06:13Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: G_Syme pkgname=twin pkgver=0.6.2 -pkgrel=3 +pkgrel=4 pkgdesc="A text-mode window environment" arch=('i686' 'x86_64') url='http://sourceforge.net/projects/twin/' @@ -17,7 +17,7 @@ md5sums=('6211c8b2e655003eb96b1fc5dc37e7d9') build() { cd $srcdir/$pkgname-$pkgver - LDFLAGS="-lX11" ./configure --prefix=/usr \ + LDFLAGS="-lX11" ./configure --prefix=/usr --sbindir=/usr/bin \ --enable-tt=yes \ --enable-tt-hw-twin=yes --enable-tt-hw-twin-tunnel=yes --enable-tt-hw-twin-detunnel=yes \ --enable-tt-hw-xml=yes diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index f04ab0934..36023adbd 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90731 2013-05-13 14:39:46Z spupykin $ +# $Id: PKGBUILD 91865 2013-05-28 17:38:11Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Zerial pkgname=unrealircd pkgver=3.2.10 -pkgrel=2 +pkgrel=4 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" @@ -18,7 +18,7 @@ source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.service arch-fixes.patch) md5sums=('05b0bbdbfab9ffc2304f7595951d7cec' - '2103ce8a4a4e79f6955920bfebea0202' + '93276a1cd426e4a811c072c35fc31e94' '77807313c4578f2c30286b9f9e3fb21c') build() { @@ -36,6 +36,7 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ + --enable-ipv6 \ --enable-libcurl=/usr \ --with-system-cares diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service index 42279fae0..a81419f2a 100644 --- a/community/unrealircd/unrealircd.service +++ b/community/unrealircd/unrealircd.service @@ -6,7 +6,7 @@ After=network.target remote-fs.target nss-lookup.target Type=forking User=ircd PIDFile=/var/run/unrealircd.pid -ExecStart=/usr/bin/unrealircd -p +ExecStart=/usr/bin/unrealircd [Install] WantedBy=multi-user.target diff --git a/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch new file mode 100644 index 000000000..86bb6e572 --- /dev/null +++ b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch @@ -0,0 +1,163 @@ +From 4fb18cde32a6cb672090762c785d89a6ed02ef57 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 9 May 2013 13:06:02 +0200 +Subject: [PATCH] libfdisk: do not use va_list in the Ask API + + # fdisk /dev/sda + Welcome to fdisk (util-linux 2.23). + + [...] + + Command (m for help): a + Segmentation fault (core dumped) + +It's too fragile, the va_list implementation is architecture specific +and it seems we need such thing in libfdisk at all. + +Reported-by: "Gabor Z. Papp" +Signed-off-by: Karel Zak +--- + fdisks/fdisk-ask.c | 13 +++---------- + libfdisk/src/ask.c | 35 +++++++++-------------------------- + libfdisk/src/fdiskP.h | 2 -- + libfdisk/src/libfdisk.h | 2 -- + 4 files changed, 12 insertions(+), 40 deletions(-) + +diff --git a/fdisks/fdisk-ask.c b/fdisks/fdisk-ask.c +index 7495d85..61dc0c2 100644 +--- a/fdisks/fdisk-ask.c ++++ b/fdisks/fdisk-ask.c +@@ -167,7 +167,6 @@ static int ask_offset(struct fdisk_context *cxt, + int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask, + void *data __attribute__((__unused__))) + { +- va_list ap; + int rc = 0; + char buf[BUFSIZ]; + +@@ -180,23 +179,17 @@ int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask, + case FDISK_ASKTYPE_OFFSET: + return ask_offset(cxt, ask, buf, sizeof(buf)); + case FDISK_ASKTYPE_INFO: +- fdisk_ask_print_get_va(ask, ap); +- vfprintf(stdout, fdisk_ask_print_get_mesg(ask), ap); ++ fputs(fdisk_ask_print_get_mesg(ask), stdout); + fputc('\n', stdout); +- va_end(ap); + break; + case FDISK_ASKTYPE_WARNX: +- fdisk_ask_print_get_va(ask, ap); +- vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap); ++ fputs(fdisk_ask_print_get_mesg(ask), stderr); + fputc('\n', stderr); +- va_end(ap); + break; + case FDISK_ASKTYPE_WARN: +- fdisk_ask_print_get_va(ask, ap); +- vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap); ++ fputs(fdisk_ask_print_get_mesg(ask), stderr); + errno = fdisk_ask_print_get_errno(ask); + fprintf(stderr, ": %m\n"); +- va_end(ap); + break; + case FDISK_ASKTYPE_YESNO: + fputc('\n', stdout); +diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c +index d2325d5..cdb4d01 100644 +--- a/libfdisk/src/ask.c ++++ b/libfdisk/src/ask.c +@@ -18,11 +18,6 @@ void fdisk_reset_ask(struct fdisk_ask *ask) + case FDISK_ASKTYPE_NUMBER: + free(ask->data.num.range); + break; +- case FDISK_ASKTYPE_WARNX: +- case FDISK_ASKTYPE_WARN: +- if (ask->data.print.has_va) +- va_end(ask->data.print.va); +- break; + default: + break; + } +@@ -452,44 +447,32 @@ int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg) + return 0; + } + +-/* caller has to call va_end(ap) */ +-int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap) +-{ +- assert(ask); +- assert(is_print_ask(ask)); +- va_copy(ap, ask->data.print.va); +- return 0; +-} +- +-/* note that fdisk_free_ask() calls va_end() to free the private va list. */ +-int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap) +-{ +- assert(ask); +- va_copy(ask->data.print.va, ap); +- ask->data.print.has_va = 1; +- return 0; +-} +- + static int do_vprint(struct fdisk_context *cxt, int errnum, int type, + const char *fmt, va_list va) + { + struct fdisk_ask *ask; + int rc; ++ char *mesg; + + assert(cxt); + ++ if (vasprintf(&mesg, fmt, va) < 0) ++ return -ENOMEM; ++ + ask = fdisk_new_ask(); +- if (!ask) ++ if (!ask) { ++ free(mesg); + return -ENOMEM; ++ } + + fdisk_ask_set_type(ask, type); +- fdisk_ask_print_set_mesg(ask, fmt); +- fdisk_ask_print_set_va(ask, va); ++ fdisk_ask_print_set_mesg(ask, mesg); + if (errnum >= 0) + fdisk_ask_print_set_errno(ask, errnum); + rc = fdisk_do_ask(cxt, ask); + + fdisk_free_ask(ask); ++ free(mesg); + return rc; + } + +diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h +index 570108c..ce42860 100644 +--- a/libfdisk/src/fdiskP.h ++++ b/libfdisk/src/fdiskP.h +@@ -231,8 +231,6 @@ struct fdisk_ask { + /* FDISK_ASKTYPE_{WARN,WARNX,..} */ + struct ask_print { + const char *mesg; +- va_list va; +- unsigned int has_va:1; + int errnum; /* errno */ + } print; + /* FDISK_ASKTYPE_YESNO */ +diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h +index 0a23236..8a44067 100644 +--- a/libfdisk/src/libfdisk.h ++++ b/libfdisk/src/libfdisk.h +@@ -182,8 +182,6 @@ extern int fdisk_ask_print_get_errno(struct fdisk_ask *ask); + extern int fdisk_ask_print_set_errno(struct fdisk_ask *ask, int errnum); + extern const char *fdisk_ask_print_get_mesg(struct fdisk_ask *ask); + extern int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg); +-extern int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap); +-extern int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap); + + #ifdef __cplusplus + } +-- +1.8.2.3 + diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 77b94f1a8..c5bacea39 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185607 2013-05-15 22:53:31Z tomegun $ +# $Id: PKGBUILD 186531 2013-05-28 12:25:50Z dreisner $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux pkgver=2.23 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -19,6 +19,7 @@ options=('!libtool') source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz" 0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch 0001-losetup-use-warn_size-for-regular-files-only.patch + 0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch uuidd.tmpfiles pam-login pam-common @@ -32,6 +33,7 @@ install=util-linux.install md5sums=('cf5e9bb402371beaaffc3a5f276d5783' 'fdb627fbb3d6a42e0b36978649b4c064' 'de0ba450945a60f27c5df86e64523d57' + 'df949d15dbff01fe9fcda5d999a35b15' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' @@ -42,6 +44,7 @@ prepare() { patch -Np1 <"$srcdir"/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch patch -Np1 <"$srcdir"/0001-losetup-use-warn_size-for-regular-files-only.patch + patch -Np1 <"$srcdir"/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch } build() { diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD index 56a7cedd2..483021853 100644 --- a/extra/flac/PKGBUILD +++ b/extra/flac/PKGBUILD @@ -1,33 +1,27 @@ -# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# $Id: PKGBUILD 186549 2013-05-28 18:39:02Z eric $ # Maintainer: Eric Bélanger pkgbase=flac pkgname=('flac' 'flac-doc') -pkgver=1.2.1 -pkgrel=3 +pkgver=1.3.0 +pkgrel=1 arch=('i686' 'x86_64') url="http://flac.sourceforge.net/" license=('BSD' 'GPL') depends=('libogg') -makedepends=('nasm' 'xmms') +makedepends=('nasm' 'xmms' 'doxygen') options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz - flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' - 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' - '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') +source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz) +sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ - --disable-sse --disable-rpath --with-pic + cd ${pkgbase}-${pkgver} + ./configure --prefix=/usr --disable-sse make } check() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make check } @@ -36,7 +30,7 @@ package_flac() { optdepends=('xmms: for using the xmms plugin') options=('!libtool' '!docs') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } @@ -45,7 +39,8 @@ package_flac-doc() { pkgdesc="Developer documentation for the Free Lossless Audio Codec" depends=('flac') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C doc install + sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag" install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch b/extra/flac/flac-1.2.1-gcc-4.3-includes.patch deleted file mode 100644 index 52fec8be5..000000000 --- a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index 37740bef3..8e3374460 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 183414 2013-04-21 22:10:50Z heftig $ +# $Id: PKGBUILD 186533 2013-05-28 12:29:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: György Balló pkgname=gssdp -pkgver=0.14.2 +pkgver=0.14.3 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=(i686 x86_64) url="http://gupnp.org/" license=(LGPL) depends=(libsoup) -makedepends=(gobject-introspection gtk2 gtk-doc vala) -optdepends=('gtk2: gssdp-device-sniffer') +makedepends=(gobject-introspection gtk3 gtk-doc vala) +optdepends=('gtk3: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc') +sha256sums=('79dbdc5f79cc406632a783826b3dbe6acc0fbf41eb801b642bce1a02ecc3c66d') build() { cd $pkgname-$pkgver diff --git a/extra/libaio/PKGBUILD b/extra/libaio/PKGBUILD new file mode 100644 index 000000000..485392608 --- /dev/null +++ b/extra/libaio/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 186545 2013-05-28 18:17:04Z tpowa $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Thomas S Hatch + +pkgname=libaio +pkgver=0.3.109 +pkgrel=6 +pkgdesc="The Linux-native asynchronous I/O facility (aio) library" +arch=('i686' 'x86_64') +url="http://lse.sourceforge.net/io/aio.html" +license=('LGPL') +source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz) +md5sums=('435a5b16ca6198eaf01155263d855756') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" install +} + diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index ab00a2f5b..54181fa11 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,28 +1,23 @@ -# $Id: PKGBUILD 167258 2012-09-29 12:58:04Z ibiru $ +# $Id: PKGBUILD 186521 2013-05-28 10:28:20Z ioni $ # Maintainer: Ionut Biru # Contributor: Andrew Cook pkgname=libbluray -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" arch=('i686' 'x86_64') url="http://www.videolan.org/developers/libbluray.html" license=('LGPL2.1') -depends=('libxml2') -makedepends=('apache-ant' 'jdk7-openjdk') -optdepends=('java-environment: Blu-ray Disc Java support library') +depends=('libxml2' 'freetype2') options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('b84fd172523facb207134bb1fee09c7f65914d22f6120fbfd6f312f0435229f3b110e8cc8ea121159929cda3760cfac4b52f84de39d0fb976f8c88d1f7e6d278') +sha512sums=('96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02') build() { cd "$pkgname-$pkgver" - . /etc/profile.d/jdk.sh ./configure --prefix=/usr \ - --enable-bdjava \ - --with-jdk=${JAVA_HOME} \ --disable-static make } @@ -30,8 +25,6 @@ build() { package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install - #install bdj - install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar" } # vim:set ts=2 sw=2 et: diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD new file mode 100644 index 000000000..26f3c5381 --- /dev/null +++ b/extra/libiscsi/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 186551 2013-05-28 18:43:28Z tpowa $ +# Maintainer: Tobias Powalowski +pkgname=libiscsi +pkgver=1.7.0 +pkgrel=1 +depends=('glibc' 'popt') +pkgdesc="Library that provides generic access to USB device" +arch=(i686 x86_64) +url="https://github.com/sahlberg/libiscsi" +license=('LGPL') +source=(https://github.com/downloads/sahlberg/${pkgname}/${pkgname}-${pkgver}.tar.gz) +options=(!libtool) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr --disable-static --libdir=/usr/lib + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('4ba621f47d016d48ab93d5301ae5a363') diff --git a/extra/libseccomp/PKGBUILD b/extra/libseccomp/PKGBUILD new file mode 100644 index 000000000..9bdaee4fc --- /dev/null +++ b/extra/libseccomp/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Daniel Micay +# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=libseccomp +pkgver=2.0.0 +pkgrel=2 +pkgdesc='Enhanced seccomp library' +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://sourceforge.net/projects/libseccomp/" +depends=('glibc') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('f988feac6a3425f2c918f32b28df1caa') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index 24a9ac5df..fc3a2745d 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,33 +1,55 @@ -# $Id: PKGBUILD 167697 2012-10-03 05:10:48Z eric $ +# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $ # Maintainer: Eric Bélanger pkgname=libtiff pkgver=4.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') url="http://www.remotesensing.org/libtiff/" license=('custom') -depends=('libjpeg' 'zlib' 'xz') -makedepends=('freeglut') +depends=('gcc-libs' 'libjpeg' 'zlib' 'xz') +makedepends=('freeglut' 'glu' 'mesa') optdepends=('freeglut: for using tiffgt') options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz + tiff-3.9.7-CVE-2012-4447.patch + tiff-3.9.7-CVE-2012-4564.patch + tiff-4.0.3-CVE-2013-1960.patch + tiff-4.0.3-CVE-2013-1961.patch + tiff-4.0.3-libjpeg-turbo.patch + tiff-4.0.3-tiff2pdf-colors.patch) +sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' + '41be661638282dae0d07bd2788414cb6650f8981' + '6cb3d480908132335c05c769b5a51f951413725d' + '5903355afdd0bb27ea3746339e2196720f9fac9d' + '29a91870cca5d4cd9ca1c464f8074088eddc3fb8' + '02d57835df50d3f84587571ec52b36f5af838de2' + '23443ad0bc130d70860b6cc6d19b69584ae7a6cc') + +prepare() { + cd tiff-${pkgver} + patch -p0 -i "${srcdir}/tiff-4.0.3-tiff2pdf-colors.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4447.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4564.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" +} build() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/tiff-${pkgver}" -# make check + cd tiff-${pkgver} + make check } package() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch new file mode 100644 index 000000000..f23e98466 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch @@ -0,0 +1,37 @@ +Upstream patch for CVE-2012-4447. This also covers an out-of-bounds-read +possibility in the same file, which wasn't given a separate CVE. + + +diff -Naur tiff-3.9.4.orig/libtiff/tif_pixarlog.c tiff-3.9.4/libtiff/tif_pixarlog.c +--- tiff-3.9.4.orig/libtiff/tif_pixarlog.c 2010-06-08 14:50:42.000000000 -0400 ++++ tiff-3.9.4/libtiff/tif_pixarlog.c 2012-12-10 15:50:14.421538317 -0500 +@@ -641,6 +641,20 @@ + return bytes; + } + ++static tsize_t ++add_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 + m2; ++ ++ /* if either input is zero, assume overflow already occurred */ ++ if (m1 == 0 || m2 == 0) ++ bytes = 0; ++ else if (bytes <= m1 || bytes <= m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + static int + PixarLogSetupDecode(TIFF* tif) + { +@@ -661,6 +675,8 @@ + td->td_samplesperpixel : 1); + tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth), + td->td_rowsperstrip), sizeof(uint16)); ++ /* add one more stride in case input ends mid-stride */ ++ tbuf_size = add_ms(tbuf_size, sizeof(uint16) * sp->stride); + if (tbuf_size == 0) + return (0); + sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size); diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch new file mode 100644 index 000000000..98a6e6c44 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch @@ -0,0 +1,77 @@ +Upstream patch for CVE-2012-4564. + + +diff -Naur tiff-3.9.4.orig/tools/ppm2tiff.c tiff-3.9.4/tools/ppm2tiff.c +--- tiff-3.9.4.orig/tools/ppm2tiff.c 2010-06-08 14:50:44.000000000 -0400 ++++ tiff-3.9.4/tools/ppm2tiff.c 2012-12-10 16:16:05.154045877 -0500 +@@ -68,6 +68,17 @@ + exit(-2); + } + ++static tsize_t ++multiply_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 * m2; ++ ++ if (m1 && bytes / m1 != m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + int + main(int argc, char* argv[]) + { +@@ -85,6 +96,7 @@ + int c; + extern int optind; + extern char* optarg; ++ tsize_t scanline_size; + + if (argc < 2) { + fprintf(stderr, "%s: Too few arguments\n", argv[0]); +@@ -217,7 +229,8 @@ + } + switch (bpp) { + case 1: +- linebytes = (spp * w + (8 - 1)) / 8; ++ /* if round-up overflows, result will be zero, OK */ ++ linebytes = (multiply_ms(spp, w) + (8 - 1)) / 8; + if (rowsperstrip == (uint32) -1) { + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, h); + } else { +@@ -226,15 +239,31 @@ + } + break; + case 8: +- linebytes = spp * w; ++ linebytes = multiply_ms(spp, w); + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, + TIFFDefaultStripSize(out, rowsperstrip)); + break; + } +- if (TIFFScanlineSize(out) > linebytes) ++ if (linebytes == 0) { ++ fprintf(stderr, "%s: scanline size overflow\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ scanline_size = TIFFScanlineSize(out); ++ if (scanline_size == 0) { ++ /* overflow - TIFFScanlineSize already printed a message */ ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ if (scanline_size < linebytes) + buf = (unsigned char *)_TIFFmalloc(linebytes); + else +- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); ++ buf = (unsigned char *)_TIFFmalloc(scanline_size); ++ if (buf == NULL) { ++ fprintf(stderr, "%s: Not enough memory\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } + if (resolution > 0) { + TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution); + TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution); diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch new file mode 100644 index 000000000..1c8dfb7bc --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch @@ -0,0 +1,145 @@ +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:04:49.057090227 -0400 +@@ -3341,33 +3341,56 @@ + uint32 height){ + + tsize_t i=0; +- uint16 ri =0; +- uint16 v_samp=1; +- uint16 h_samp=1; +- int j=0; +- +- i++; +- +- while(i<(*striplength)){ ++ ++ while (i < *striplength) { ++ tsize_t datalen; ++ uint16 ri; ++ uint16 v_samp; ++ uint16 h_samp; ++ int j; ++ int ncomp; ++ ++ /* marker header: one or more FFs */ ++ if (strip[i] != 0xff) ++ return(0); ++ i++; ++ while (i < *striplength && strip[i] == 0xff) ++ i++; ++ if (i >= *striplength) ++ return(0); ++ /* SOI is the only pre-SOS marker without a length word */ ++ if (strip[i] == 0xd8) ++ datalen = 0; ++ else { ++ if ((*striplength - i) <= 2) ++ return(0); ++ datalen = (strip[i+1] << 8) | strip[i+2]; ++ if (datalen < 2 || datalen >= (*striplength - i)) ++ return(0); ++ } + switch( strip[i] ){ +- case 0xd8: +- /* SOI - start of image */ ++ case 0xd8: /* SOI - start of image */ + _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); + *bufferoffset+=2; +- i+=2; + break; +- case 0xc0: +- case 0xc1: +- case 0xc3: +- case 0xc9: +- case 0xca: ++ case 0xc0: /* SOF0 */ ++ case 0xc1: /* SOF1 */ ++ case 0xc3: /* SOF3 */ ++ case 0xc9: /* SOF9 */ ++ case 0xca: /* SOF10 */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- for(j=0;j>4) > h_samp) +- h_samp = (buffer[*bufferoffset+11+(2*j)]>>4); +- if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) +- v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f); ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ ncomp = buffer[*bufferoffset+9]; ++ if (ncomp < 1 || ncomp > 4) ++ return(0); ++ v_samp=1; ++ h_samp=1; ++ for(j=0;j>4) > h_samp) ++ h_samp = (samp>>4); ++ if( (samp & 0x0f) > v_samp) ++ v_samp = (samp & 0x0f); + } + v_samp*=8; + h_samp*=8; +@@ -3381,45 +3404,43 @@ + (unsigned char) ((height>>8) & 0xff); + buffer[*bufferoffset+6]= + (unsigned char) (height & 0xff); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; +- ++ *bufferoffset+=datalen+2; ++ /* insert a DRI marker */ + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]=0xdd; + buffer[(*bufferoffset)++]=0x00; + buffer[(*bufferoffset)++]=0x04; + buffer[(*bufferoffset)++]=(ri >> 8) & 0xff; + buffer[(*bufferoffset)++]= ri & 0xff; +- } else { +- i+=strip[i+2]+2; + } + break; +- case 0xc4: +- case 0xdb: +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ case 0xc4: /* DHT */ ++ case 0xdb: /* DQT */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + break; +- case 0xda: ++ case 0xda: /* SOS */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + } else { + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]= + (unsigned char)(0xd0 | ((no-1)%8)); +- i+=strip[i+2]+2; + } +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1); +- *bufferoffset+=(*striplength)-i-1; ++ i += datalen + 1; ++ /* copy remainder of strip */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i); ++ *bufferoffset+= *striplength - i; + return(1); + default: +- i+=strip[i+2]+2; ++ /* ignore any other marker */ ++ break; + } ++ i += datalen + 1; + } +- + ++ /* failed to find SOS marker */ + return(0); + } + #endif diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch new file mode 100644 index 000000000..0ea9b52e3 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch @@ -0,0 +1,759 @@ +diff -Naur tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c tiff-4.0.3/contrib/dbs/xtiff/xtiff.c +--- tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c 2010-06-08 14:55:15.000000000 -0400 ++++ tiff-4.0.3/contrib/dbs/xtiff/xtiff.c 2013-05-02 12:02:42.782287939 -0400 +@@ -512,9 +512,9 @@ + Arg args[1]; + + if (tfMultiPage) +- sprintf(buffer, "%s - page %d", fileName, tfDirectory); ++ snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory); + else +- strcpy(buffer, fileName); ++ snprintf(buffer, sizeof(buffer), "%s", fileName); + XtSetArg(args[0], XtNlabel, buffer); + XtSetValues(labelWidget, args, 1); + } +diff -Naur tiff-4.0.3.orig/libtiff/tif_codec.c tiff-4.0.3/libtiff/tif_codec.c +--- tiff-4.0.3.orig/libtiff/tif_codec.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/libtiff/tif_codec.c 2013-05-02 12:02:42.783287946 -0400 +@@ -108,7 +108,8 @@ + const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); + char compression_code[20]; + +- sprintf( compression_code, "%d", tif->tif_dir.td_compression ); ++ snprintf(compression_code, sizeof(compression_code), "%d", ++ tif->tif_dir.td_compression ); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s compression support is not configured", + c ? c->name : compression_code ); +diff -Naur tiff-4.0.3.orig/libtiff/tif_dirinfo.c tiff-4.0.3/libtiff/tif_dirinfo.c +--- tiff-4.0.3.orig/libtiff/tif_dirinfo.c 2012-08-19 12:56:34.000000000 -0400 ++++ tiff-4.0.3/libtiff/tif_dirinfo.c 2013-05-02 12:02:42.784287953 -0400 +@@ -711,7 +711,7 @@ + * note that this name is a special sign to TIFFClose() and + * _TIFFSetupFields() to free the field + */ +- sprintf(fld->field_name, "Tag %d", (int) tag); ++ snprintf(fld->field_name, 32, "Tag %d", (int) tag); + + return fld; + } +diff -Naur tiff-4.0.3.orig/tools/rgb2ycbcr.c tiff-4.0.3/tools/rgb2ycbcr.c +--- tiff-4.0.3.orig/tools/rgb2ycbcr.c 2011-05-31 13:03:16.000000000 -0400 ++++ tiff-4.0.3/tools/rgb2ycbcr.c 2013-05-02 12:02:42.785287961 -0400 +@@ -332,7 +332,8 @@ + TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + { char buf[2048]; + char *cp = strrchr(TIFFFileName(in), '/'); +- sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in)); ++ snprintf(buf, sizeof(buf), "YCbCr conversion of %s", ++ cp ? cp+1 : TIFFFileName(in)); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf); + } + TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion()); +diff -Naur tiff-4.0.3.orig/tools/tiff2bw.c tiff-4.0.3/tools/tiff2bw.c +--- tiff-4.0.3.orig/tools/tiff2bw.c 2010-07-08 12:10:24.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2bw.c 2013-05-02 12:02:42.785287961 -0400 +@@ -205,7 +205,7 @@ + } + } + TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); +- sprintf(thing, "B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw"); + outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:02:42.788287983 -0400 +@@ -3609,7 +3609,9 @@ + char buffer[16]; + int buflen=0; + +- buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff); ++ buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ", ++ t2p->pdf_majorversion&0xff, ++ t2p->pdf_minorversion&0xff); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7); + +@@ -3623,10 +3625,10 @@ + tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen ); + written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7); + +@@ -3665,13 +3667,13 @@ + written += t2pWriteFile(output, (tdata_t) "/", 1); + for (i=0;i 0x7E){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; +@@ -3679,57 +3681,57 @@ + if (nextchar==0){ + switch (name[i]){ + case 0x23: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x25: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x28: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x29: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x2F: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3C: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3E: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; +@@ -3844,14 +3846,14 @@ + tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/Length ", 8); + if(len!=0){ + written += t2p_write_pdf_stream_length(len, output); + } else { +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + } +@@ -3892,10 +3894,10 @@ + tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)len); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n", 1); + +@@ -3909,7 +3911,7 @@ + tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output) + { + tsize_t written = 0; +- char buffer[16]; ++ char buffer[32]; + int buflen = 0; + + written += t2pWriteFile(output, +@@ -3948,7 +3950,6 @@ + written += t2p_write_pdf_string(t2p->pdf_datetime, output); + } + written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11); +- _TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer)); + snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION); + written += t2p_write_pdf_string(buffer, output); + written += t2pWriteFile(output, (tdata_t) "\n", 1); +@@ -4089,7 +4090,7 @@ + { + tsize_t written=0; + tdir_t i=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + int page=0; +@@ -4097,7 +4098,7 @@ + (tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26); + page = t2p->pdf_pages+1; + for (i=0;itiff_pagecount;i++){ +- buflen=sprintf(buffer, "%d", page); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", page); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + if ( ((i+1)%8)==0 ) { +@@ -4112,8 +4113,7 @@ + } + } + written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%d", t2p->tiff_pagecount); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6); + +@@ -4128,28 +4128,28 @@ + + unsigned int i=0; + tsize_t written=0; +- char buffer[16]; ++ char buffer[256]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "] \n", 3); + written += t2pWriteFile(output, (tdata_t) "/Contents ", 10); +- buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15); +@@ -4157,15 +4157,13 @@ + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + for(i=0;itiff_tiles[t2p->pdf_page].tiles_tilecount;i++){ + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen = sprintf(buffer, "%u", i+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", i+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4177,12 +4175,10 @@ + } else { + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4191,9 +4187,7 @@ + if(t2p->tiff_transferfunctioncount != 0) { + written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13); + t2pWriteFile(output, (tdata_t) "/GS1 ", 5); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4566,7 +4560,7 @@ + if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ + for(i=0;itiff_tiles[t2p->pdf_page].tiles_tilecount; i++){ + box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4581,7 +4575,7 @@ + } + } else { + box=t2p->pdf_imagebox; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4606,59 +4600,48 @@ + TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); + written += t2pWriteFile(output, + (tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", + 42); +- buflen=sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + if(tile != 0){ + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen=sprintf(buffer, "%lu", (unsigned long)tile); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length); + } else { + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13); + written += t2p_write_pdf_xobject_cs(t2p, output); +@@ -4702,11 +4685,10 @@ + t2p->pdf_colorspace ^= T2P_CS_PALETTE; + written += t2p_write_pdf_xobject_cs(t2p, output); + t2p->pdf_colorspace |= T2P_CS_PALETTE; +- buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7); + return(written); +@@ -4740,10 +4722,10 @@ + X_W /= Y_W; + Z_W /= Y_W; + Y_W = 1.0F; +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Range ", 7); +- buflen=sprintf(buffer, "[%d %d %d %d] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", + t2p->pdf_labrange[0], + t2p->pdf_labrange[1], + t2p->pdf_labrange[2], +@@ -4759,26 +4741,26 @@ + tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25); + if(t2p->tiff_transferfunctioncount == 1){ +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + } else { + written += t2pWriteFile(output, (tdata_t) "[ ", 2); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 2)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4800,7 +4782,7 @@ + written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17); + written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19); + written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18); +- buflen=sprintf(buffer, "/Size [%u] \n", (1<tiff_bitspersample)); ++ buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<tiff_bitspersample)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19); + written += t2p_write_pdf_stream_dict(((tsize_t)1)<<(t2p->tiff_bitspersample+1), 0, output); +@@ -4827,7 +4809,7 @@ + tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[128]; ++ char buffer[256]; + int buflen=0; + + float X_W=0.0; +@@ -4895,16 +4877,16 @@ + written += t2pWriteFile(output, (tdata_t) "<< \n", 4); + if(t2p->pdf_colorspace & T2P_CS_CALGRAY){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12); + } + if(t2p->pdf_colorspace & T2P_CS_CALRGB){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", + X_R, Y_R, Z_R, + X_G, Y_G, Z_G, + X_B, Y_B, Z_B); +@@ -4923,11 +4905,11 @@ + tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7); + +@@ -4937,11 +4919,11 @@ + tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/N ", 3); +- buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11); + t2p->pdf_colorspace ^= T2P_CS_ICCBASED; +@@ -5006,7 +4988,7 @@ + tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + if(t2p->pdf_compression==T2P_COMPRESS_NONE){ +@@ -5021,41 +5003,33 @@ + written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9); + if(tile==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_length); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } +@@ -5082,21 +5056,17 @@ + if(t2p->pdf_compressionquality%100){ + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); + written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Columns ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen = sprintf(buffer, "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Colors ", 9); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) ">>\n", 3); + } +@@ -5116,16 +5086,16 @@ + tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[21]; ++ char buffer[64]; + int buflen=0; + uint32 i=0; + + written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22); + for (i=0;ipdf_xrefcount;i++){ +- sprintf(buffer, "%.10lu 00000 n \n", ++ snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n", + (unsigned long)t2p->pdf_xrefoffsets[i]); + written += t2pWriteFile(output, (tdata_t) buffer, 20); + } +@@ -5149,17 +5119,14 @@ + snprintf(t2p->pdf_fileid + i, 9, "%.8X", rand()); + + written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17); +- buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11); + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); +@@ -5167,9 +5134,8 @@ + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); + written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7); + + return(written); +diff -Naur tiff-4.0.3.orig/tools/tiff2ps.c tiff-4.0.3/tools/tiff2ps.c +--- tiff-4.0.3.orig/tools/tiff2ps.c 2011-05-31 13:10:18.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2ps.c 2013-05-02 12:02:42.789287990 -0400 +@@ -1781,8 +1781,8 @@ + imageOp = "imagemask"; + + (void)strcpy(im_x, "0"); +- (void)sprintf(im_y, "%lu", (long) h); +- (void)sprintf(im_h, "%lu", (long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu", (long) h); ++ (void)snprintf(im_h, sizeof(im_h), "%lu", (long) h); + tile_width = w; + tile_height = h; + if (TIFFIsTiled(tif)) { +@@ -1803,7 +1803,7 @@ + } + if (tile_height < h) { + fputs("/im_y 0 def\n", fd); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } else { + repeat_count = tf_numberstrips; +@@ -1815,7 +1815,7 @@ + fprintf(fd, "/im_h %lu def\n", + (unsigned long) tile_height); + (void)strcpy(im_h, "im_h"); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } + +diff -Naur tiff-4.0.3.orig/tools/tiffcrop.c tiff-4.0.3/tools/tiffcrop.c +--- tiff-4.0.3.orig/tools/tiffcrop.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/tools/tiffcrop.c 2013-05-02 12:02:42.791288005 -0400 +@@ -2077,7 +2077,7 @@ + return 1; + } + +- sprintf (filenum, "-%03d%s", findex, export_ext); ++ snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext); + filenum[14] = '\0'; + strncat (exportname, filenum, 15); + } +@@ -2230,8 +2230,8 @@ + + /* dump.infilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s", ++ dump.infilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL) + { +@@ -2249,8 +2249,8 @@ + + /* dump.outfilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s", ++ dump.outfilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL) + { +diff -Naur tiff-4.0.3.orig/tools/tiffdither.c tiff-4.0.3/tools/tiffdither.c +--- tiff-4.0.3.orig/tools/tiffdither.c 2010-03-10 13:56:50.000000000 -0500 ++++ tiff-4.0.3/tools/tiffdither.c 2013-05-02 12:02:42.792288013 -0400 +@@ -260,7 +260,7 @@ + TIFFSetField(out, TIFFTAG_FILLORDER, fillorder); + else + CopyField(TIFFTAG_FILLORDER, shortv); +- sprintf(thing, "Dithered B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + CopyField(TIFFTAG_PHOTOMETRIC, shortv); + CopyField(TIFFTAG_ORIENTATION, shortv); diff --git a/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch new file mode 100644 index 000000000..92cff7ea4 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch @@ -0,0 +1,122 @@ +Back-port upstream patch to avoid assuming quite so much about what libjpeg +will return. Needed because libjpeg-turbo with the jpeg8 API broke the +expectations of the previous coding. + + +diff -Naur tiff-4.0.3.orig/test/raw_decode.c tiff-4.0.3/test/raw_decode.c +--- tiff-4.0.3.orig/test/raw_decode.c 2012-07-06 13:05:16.000000000 -0400 ++++ tiff-4.0.3/test/raw_decode.c 2012-12-19 13:04:37.609738276 -0500 +@@ -71,33 +71,54 @@ + return 1; + } + +-static int check_rgb_pixel( int pixel, int red, int green, int blue, unsigned char *buffer ) { ++static int check_rgb_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ unsigned char *buffer ) { + unsigned char *rgb = buffer + 3 * pixel; + +- if( rgb[0] == red && rgb[1] == green && rgb[2] == blue ) { ++ if( rgb[0] >= min_red && rgb[0] <= max_red && ++ rgb[1] >= min_green && rgb[1] <= max_green && ++ rgb[2] >= min_blue && rgb[2] <= max_blue ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d\n", red, green, blue ); +- fprintf( stderr, " Got: %3d %3d %3d\n", rgb[0], rgb[1], rgb[2] ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d)\n", ++ rgb[0], min_red, max_red, ++ rgb[1], min_green, max_green, ++ rgb[2], min_blue, max_blue ); + return 1; + } + +-static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, uint32 *buffer ) { ++static int check_rgba_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ int min_alpha, int max_alpha, ++ uint32 *buffer ) { + /* RGBA images are upside down - adjust for normal ordering */ + int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128; + uint32 rgba = buffer[adjusted_pixel]; + +- if( TIFFGetR(rgba) == (uint32) red && TIFFGetG(rgba) == (uint32) green && +- TIFFGetB(rgba) == (uint32) blue && TIFFGetA(rgba) == (uint32) alpha ) { ++ if( TIFFGetR(rgba) >= (uint32) min_red && ++ TIFFGetR(rgba) <= (uint32) max_red && ++ TIFFGetG(rgba) >= (uint32) min_green && ++ TIFFGetG(rgba) <= (uint32) max_green && ++ TIFFGetB(rgba) >= (uint32) min_blue && ++ TIFFGetB(rgba) <= (uint32) max_blue && ++ TIFFGetA(rgba) >= (uint32) min_alpha && ++ TIFFGetA(rgba) <= (uint32) max_alpha ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d %3d\n", red, green, blue, alpha ); +- fprintf( stderr, " Got: %3d %3d %3d %3d\n", +- TIFFGetR(rgba), TIFFGetG(rgba), TIFFGetB(rgba), TIFFGetA(rgba) ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d), A=%d (expected %d..%d)\n", ++ TIFFGetR(rgba), min_red, max_red, ++ TIFFGetG(rgba), min_green, max_green, ++ TIFFGetB(rgba), min_blue, max_blue, ++ TIFFGetA(rgba), min_alpha, max_alpha ); + return 1; + } + +@@ -191,15 +212,17 @@ + return 1; + } + +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgb_pixel( 0, 18, 0, 41, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 0, buffer ); +- pixel_status |= check_rgb_pixel( 512, 5, 34, 196, buffer ); +-#else +- pixel_status |= check_rgb_pixel( 0, 15, 0, 18, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 2, buffer ); +- pixel_status |= check_rgb_pixel( 512, 6, 36, 182, buffer ); +-#endif ++ /* ++ * JPEG decoding is inherently inexact, so we can't test for exact ++ * pixel values. (Well, if we knew exactly which libjpeg version ++ * we were using, and with what settings, we could expect specific ++ * values ... but it's not worth the trouble to keep track of.) ++ * Hence, use ranges of expected values. The ranges may need to be ++ * widened over time as more versions of libjpeg appear. ++ */ ++ pixel_status |= check_rgb_pixel( 0, 15, 18, 0, 0, 18, 41, buffer ); ++ pixel_status |= check_rgb_pixel( 64, 0, 0, 0, 0, 0, 2, buffer ); ++ pixel_status |= check_rgb_pixel( 512, 5, 6, 34, 36, 182, 196, buffer ); + + free( buffer ); + +@@ -224,15 +247,12 @@ + * accomplish it from the YCbCr subsampled buffer ourselves in which + * case the results may be subtly different but similar. + */ +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgba_pixel( 0, 18, 0, 41, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 5, 34, 196, 255, rgba_buffer ); +-#else +- pixel_status |= check_rgba_pixel( 0, 15, 0, 18, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 2, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 6, 36, 182, 255, rgba_buffer ); +-#endif ++ pixel_status |= check_rgba_pixel( 0, 15, 18, 0, 0, 18, 41, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 0, 0, 2, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 512, 5, 6, 34, 36, 182, 196, 255, 255, ++ rgba_buffer ); + + free( rgba_buffer ); + TIFFClose(tif); diff --git a/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch new file mode 100644 index 000000000..a503444b1 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/145055 + +http://build.opensuse.org/package/view_file?file=tiff-4.0.2-tiff2pdf-colors.patch&package=tiff&project=openSUSE%3AFactory + +--- tools/tiff2pdf.c ++++ tools/tiff2pdf.c +@@ -4991,7 +4991,7 @@ + + if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR) { + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); +- written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 0 >>\n", 24); ++ written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 1 >>\n", 24); + } + break; + #endif diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 6e0c63505..b14bf1b55 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181124 2013-03-31 19:16:50Z stephane $ +# $Id: PKGBUILD 186514 2013-05-28 09:58:04Z ioni $ # Maintainer : Ionut Biru # Contributor: Hugo Doria pkgname=libtorrent-rasterbar -pkgver=0.16.9 -pkgrel=2 +pkgver=0.16.10 +pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('4335c8b275f041d6d34a493b21f2d7234ffca34b') +sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42') build() { cd $pkgname-$pkgver diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index c30185c39..edac4627b 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 167256 2012-09-29 12:54:29Z ibiru $ +# $Id: PKGBUILD 186524 2013-05-28 10:31:58Z ioni $ # Maintainer: Ionut Biru pkgname=openconnect -pkgver=4.07 +pkgver=5.00 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" arch=('i686' 'x86_64') license=('GPL') url="http://www.infradead.org/openconnect.html" -depends=('libxml2' 'openssl' 'libproxy' 'vpnc') -makedepends=('intltool') +depends=('libxml2' 'gnutls' 'libproxy' 'vpnc') +makedepends=('intltool' 'python2') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('61f26e7936d8b26c0f7e8119b7ef84b2') +md5sums=('b3677a4b15f8c530615f4c42dadce275') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static make } diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index 970a4d45d..799cfc43c 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183529 2013-04-22 13:10:36Z heftig $ +# $Id: PKGBUILD 186511 2013-05-28 09:43:54Z ioni $ # Maintainer: Ionut Biru pkgname=p11-kit -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=('BSD') depends=('glibc' 'libtasn1') options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('e4ef21592dbd126b62e1a6d4ad65ce5c' +md5sums=('7bb1703f38fb778054bf57477c78dc8f' 'SKIP') build() { diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index a2b625131..e8bd381dd 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183634 2013-04-25 18:08:44Z ioni $ +# $Id: PKGBUILD 186515 2013-05-28 09:58:49Z ioni $ # Maintainer: Ionut Biru # Contributor: Bjorn Lindeijer # Contributor: Samuel Mendes pkgname=telepathy-idle -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('telepathy-glib') makedepends=('libxslt' 'python2') install=telepathy-idle.install source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('56f960ed1d9ed0c01e0b9f7eb68dbebe') +md5sums=('afabda908a798aac3a427f4564af113a') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index a78883f81..a99cc4d1b 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169980 2012-10-30 23:00:04Z heftig $ +# $Id: PKGBUILD 186517 2013-05-28 10:02:46Z ioni $ # Maintainer: Ionut Biru # Contributor: Ju Liu # Contributor: Bjorn Lindeijer # Contributor: Andreas Zwinkau pkgname=telepathy-mission-control -pkgver=5.14.0 +pkgver=5.14.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('libxslt' 'python2') install=telepathy-mission-control.install options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('483fa8860891815a540ecf1bb9155122') +md5sums=('e06fb0399ec435e59c74d79a2ace8a2d') build() { cd "$pkgname-$pkgver" diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 4a459ffdc..430ab93d5 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -8,9 +8,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130522 -_libretools_commit=379ff751c59d528bd4f1a8e7a24fc039e8e408ba -_devtools_commit=89d15e7697da2169493142f78a90b57a784d8f22 +pkgver=20130528.2 +_libretools_commit=e5c22aaf01484e7fa5926952bbcacd56228dbb64 +_devtools_commit=d197eacf8b7aba0796a0f6ac6ac1667564bd614e _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -19,6 +19,7 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta pkgrel=1 arch=('any') makedepends=(emacs) # emacs --batch is used during the build to process text +checkdepends=(sh-roundup) build() { cd "$srcdir" @@ -27,10 +28,23 @@ build() { make build-libretools build-libretools-mips64el build-doc } +check() { + cd "$srcdir/$pkgbase-$_libretools_commit" + + # some tests require 'sudo'; trick those into passing + mkdir "$srcdir/bin" + ln -s $(which true) "$srcdir/bin/sudo" + _PATH=$PATH + export PATH="$srcdir/bin:$PATH" + + make check + + export PATH=$_PATH +} + package_libretools() { backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install - groups=(base-devel) replaces=(chroottools) depends=( @@ -57,5 +71,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('1fac1e8166cc5b686ed3fe6d99588c21' - '21d77c519a7496185c40399d1cfa26bf') +md5sums=('47ff5308a56dd8ae2cf18b82a99b0021' + '05b987e6b39c963154489ac6d01d0965') diff --git a/libre-testing/ronn/PKGBUILD b/libre-testing/ronn/PKGBUILD new file mode 100644 index 000000000..4bd097048 --- /dev/null +++ b/libre-testing/ronn/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Luke Shumaker +# Maintainer (AUR): David Campbell + +_gemname=mustache +pkgname=ruby-$_gemname +pkgver=0.99.4 +pkgdesc="A framework-agnostic way to render logic-free views." +url="http://mustache.github.io/" +license=('custom:MIT') + +pkgrel=3 +arch=('any') +depends=('ruby>=2') +makedepends=('rubygems') +source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem") +md5sums=('650194ec2c166feb087377647414b9dc') +noextract=($_gemname-$pkgver.gem) + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre-testing/ruby-rdiscount/PKGBUILD new file mode 100644 index 000000000..76e4b58bd --- /dev/null +++ b/libre-testing/ruby-rdiscount/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Luke Shumaker +# Contributor: Massimiliano Torromeo + +_gemname=rdiscount +pkgname=ruby-$_gemname +pkgver=1.6.5 +pkgdesc="C implementation of John Gruber's Markdown." +url="http://dafoster.net/projects/rdiscount/" + +# About the license: It is a 4-clause BSD license with the 3rd clause modified +# to mention documentation instead of advertising. Not to be confused with +# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license +# (dropping the 3rd clause). Because of the way it is modified, it doesn't have +# the problems normally associated with the 4-clause BSD license. +license=('custom:modified-BSD4') + +pkgrel=2 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('2de321f1ba826f80b84fe45c0d013fcf') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre-testing/sh-roundup/PKGBUILD new file mode 100644 index 000000000..7c17669d3 --- /dev/null +++ b/libre-testing/sh-roundup/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Luke Shumaker /dev/null ; done ++ shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done + + .PHONY: pages + pages : doc diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index 788d4f435..87913af64 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -1,34 +1,78 @@ # Maintainer: Xavier Devlamynck # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Maintainer (Parabola): André Silva +# Contributor (Parabola): Márcio Silva pkgname=jitsi -pkgver=2.0.4506.10553 -pkgrel=6 +pkgver=2.2.4603.9615 +pkgrel=2 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://jitsi.org" license=('LGPL') -depends=('java-runtime') -makedepends=('apache-ant' 'java-environment') +depends=('jre7-openjdk') +makedepends=('apache-ant' 'jdk7-openjdk') options=(!strip !emptydirs zipman !libtool docs) source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop - jitsi.sh) -sha256sums=('939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d' + jitsi.sh + drop-open-term-on-index-jn-html.patch) +sha256sums=('6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' - '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5') + '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' + 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631') + +prepare() { + cd $srcdir/$pkgname-src-$pkgver -build() -{ - cd "${srcdir}/${pkgname}" # append the build revision to the jitsi version - sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + + # remove Open Source term + patch -Np0 -i ../drop-open-term-on-index-jn-html.patch + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$pkgname-src-$pkgver . /etc/profile.d/apache-ant.sh ant rebuild } package() { - cd "${srcdir}/${pkgname}" + cd $srcdir/$pkgname-src-$pkgver find lib/ lib/bundle/ -maxdepth 1 -type f \ -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; find lib/os-specific/linux/ -maxdepth 1 -type f \ diff --git a/pcr/jitsi/drop-open-term-on-index-jn-html.patch b/pcr/jitsi/drop-open-term-on-index-jn-html.patch new file mode 100644 index 000000000..8d4012a05 --- /dev/null +++ b/pcr/jitsi/drop-open-term-on-index-jn-html.patch @@ -0,0 +1,6 @@ +--- www/index-jn.html 2011-01-29 08:36:48.000000000 -0200 ++++ www/index-jn.html-new 2013-05-29 01:05:48.942716248 -0300 +@@ -1,2 +1,2 @@ + +-

sip-communicator.org
SIP Communicator
Open Source VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Open Source / Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
++

sip-communicator.org
SIP Communicator
Free Software VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
-- cgit v1.2.3-54-g00ecf