diff options
| author | root <root@rshg054.dnsready.net> | 2012-08-21 00:02:33 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-08-21 00:02:33 +0000 |
| commit | a3669c04838b48b6891b2ffc4b296fa515f8174f (patch) | |
| tree | fb838dbf7e59e2f79d7fca0fce6d93c254a5c173 | |
| parent | 524da814660fa35bca4a24d0faa0a10b7eab5c6f (diff) | |
Tue Aug 21 00:02:33 UTC 2012
45 files changed, 881 insertions, 306 deletions
diff --git a/community-testing/qingy/PKGBUILD b/community-testing/qingy/PKGBUILD index 308dc15a5..54b88a8d9 100644 --- a/community-testing/qingy/PKGBUILD +++ b/community-testing/qingy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73968 2012-07-17 18:47:40Z ebelanger $ +# $Id: PKGBUILD 75329 2012-08-19 23:16:11Z ebelanger $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qingy pkgver=1.0.0 -pkgrel=5 +pkgrel=6 pkgdesc="A DirectFB getty replacement" arch=('i686' 'x86_64') url="http://qingy.sourceforge.net/" @@ -15,9 +15,10 @@ backup=('etc/qingy/settings' 'etc/qingy/welcomes') options=('!libtool') install=qingy.install source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \ - qingy.logrotate) -md5sums=('1e0912655e240adfd0ce5ced30bbc685' - 'a9bdfd0ac9f29380eafa97a4a056789d') + qingy.logrotate qingy@.service) +sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81' + '21676cf0b71334c666f7b3e4f3d8b4f319266c81' + '55cfd0b24c1dedd8aaea42fd03f5ec39a1be5e70') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -33,4 +34,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy" + install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service" } diff --git a/community-testing/qingy/qingy@.service b/community-testing/qingy/qingy@.service new file mode 100644 index 000000000..ce2156def --- /dev/null +++ b/community-testing/qingy/qingy@.service @@ -0,0 +1,20 @@ +[Unit] +Description=Quingy on %I +Documentation=info:qingy +After=systemd-user-sessions.service plymouth-quit-wait.service + +[Service] +Environment=TERM=linux +ExecStart=/sbin/qingy %I -n +Restart=always +RestartSec=0 +UtmpIdentifier=%I +TTYPath=/dev/%I +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes +KillMode=process +IgnoreSIGPIPE=no + +[Install] +Alias=getty.target.wants/qingy@tty1.service diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD index 1eda842a0..8ad8e7795 100644 --- a/community/evas_generic_loaders-svn/PKGBUILD +++ b/community/evas_generic_loaders-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75123 2012-08-14 09:46:37Z rvanharen $ +# $Id: PKGBUILD 75312 2012-08-19 08:00:14Z heftig $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas_generic_loaders-svn pkgver=75109 -pkgrel=1 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') @@ -15,7 +15,6 @@ makedepends=('subversion') conflicts=('evas_generic_loaders') provides=('evas_generic_loaders') options=('!libtool' '!emptydirs') -md5sums=() _svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders" _svnmod="evas_generic_loaders" @@ -49,5 +48,4 @@ package() { "$pkgdir/usr/share/licenses/$pkgname/COPYING" rm -r "$srcdir/$_svnmod-build" - } diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index f5b795f13..e1bc2770e 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74537 2012-07-30 05:08:23Z lcarlier $ +# $Id: PKGBUILD 75313 2012-08-19 08:00:28Z heftig $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=5 +pkgrel=6 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index fc6401272..8235914f2 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74975 2012-08-10 23:14:23Z lcarlier $ +# $Id: PKGBUILD 75314 2012-08-19 08:00:36Z heftig $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 4f68aaa85..73d27883f 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74837 2012-08-06 23:09:06Z andrea $ +# $Id: PKGBUILD 75315 2012-08-19 08:00:41Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=0.6.3 -pkgrel=6 +pkgrel=7 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD index fcf870eb4..f7370e8e6 100644 --- a/community/mfs/PKGBUILD +++ b/community/mfs/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 71606 2012-05-30 19:22:00Z arodseth $ +# $Id: PKGBUILD 75321 2012-08-19 15:17:28Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> pkgbase=mfs -pkgname=('mfs-client' 'mfs-chunkserver' 'mfs-master') -pkgver=1.6.25 +pkgname=('mfs-master' 'mfs-chunkserver' 'mfs-client') +pkgver=1.6.26 pkgrel=1 -pkgdesc="MooseFS, fault tolerant, network distributed file system" -license=("GPL3") +pkgdesc='MooseFS, fault tolerant, network distributed file system' +license=('GPL3') arch=('x86_64' 'i686') options=('!libtool') -depends=('zlib' 'fuse' 'python2' 'bash') -url="http://www.moosefs.com/" +depends=('zlib' 'fuse' 'python2' 'bash' 'xfsprogs') +url='http://www.moosefs.com/' +install=mfs.install source=("http://www.moosefs.org/tl_files/mfscode/mfs-$pkgver.tar.gz" - "mfsmaster" - "mfschunkserver" - "mfsmetalogger" - "mfscgiserv") -sha256sums=('64b7ce749699e437f47e1561e8044362ea714a8dd2d3bad0c6a7165e9ad142ee' + 'mfsmaster.service' + 'mfschunkserver.service' + 'mfsmetalogger.service' + 'mfscgiserv.service' + 'mfsmaster' + 'mfschunkserver' + 'mfsmetalogger' + 'mfscgiserv') +sha256sums=('f250f97c6f2a229277fdbf9fe96036873fd6c95a38f484f06e6b87a404c01885' + 'b24fc4f699e7d11fcda00d83a1feb45aa0e6f4f448e675a1857edcf315427fe0' + '19262bde4dbefb1d3eba09ba7d507595aed9647328a0a7822bbc1915ae3201a7' + 'bf92e93be68308d53f649de84dc5bbb0fb433e33306b8d0c303be6c6c3e59a55' + '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a' '7c307f7be520644ac5d9c71e39ff7ec7e26800aa77c8a18c51a2d0087e5b2f48' '2d07e544f4bfeb497c24276936d3a8ce9f906597d6b9c898dc491426b21e74e0' 'd9c072cbb9d9645e5131d08b08628ccc2a2bef0a4e9c6fd8c3c33e50efce39f3' @@ -26,42 +35,40 @@ sha256sums=('64b7ce749699e437f47e1561e8044362ea714a8dd2d3bad0c6a7165e9ad142ee' build() { cd "$srcdir" - msg2 "Building client..." + msg2 'Building client...' cp -r $pkgbase-$pkgver $pkgbase-client cd $pkgbase-client ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/mfs \ --localstatedir=/var/lib \ --disable-mfschunkserver \ --disable-mfsmaster \ --disable-mfscgi \ --disable-mfscgiserv make - cd .. - msg2 "Building chunkserver..." + msg2 'Building chunkserver...' cp -r $pkgbase-$pkgver $pkgbase-chunk cd $pkgbase-chunk ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/mfs \ --localstatedir=/var/lib \ --disable-mfsmaster \ --disable-mfsmount \ --disable-mfscgi \ --disable-mfscgiserv make - cd .. - msg2 "Building master..." + msg2 'Building master...' cp -r $pkgbase-$pkgver $pkgbase-master cd $pkgbase-master ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/mfs \ --localstatedir=/var/lib \ --disable-mfschunkserver \ --disable-mfsmount @@ -71,7 +78,11 @@ build() { package_mfs-client() { depends=('zlib' 'fuse' 'bash') cd "$srcdir/$pkgbase-client" + + msg2 'Packaging client...' make DESTDIR="$pkgdir" install + + msg2 'Cleaning up...' rm -rf "$pkgdir/usr/share/man/man7" rmdir "$pkgdir/usr/share/man/man5" } @@ -79,27 +90,52 @@ package_mfs-client() { package_mfs-chunkserver() { depends=('zlib' 'bash') cd "$srcdir/$pkgbase-chunk" + + msg2 'Packaging chunkserver...' make DESTDIR="$pkgdir" install + + msg2 'Packaging Systemd service...' + install -Dm644 "$srcdir/mfschunkserver.service" \ + "$pkgdir/usr/lib/systemd/system/mfschunkserver.service" + + msg2 'Packaging initscript...' + install -Dm755 "$srcdir/mfschunkserver" "$pkgdir/etc/rc.d/mfschunkserver" + + msg2 'Cleaning up...' rm -rf "$pkgdir/usr/share/man/man7" rmdir "$pkgdir/usr/share/man/man1" - install -Dm755 "$srcdir/mfschunkserver" "$pkgdir/etc/rc.d/mfschunkserver" mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" } package_mfs-master() { depends=('zlib' 'python2') cd "$srcdir/$pkgbase-master" + + msg2 'Packaging master, metalogger and web interface...' make DESTDIR="$pkgdir" install + + msg2 'Packaging various text files...' install -Dm644 README "$pkgdir/usr/share/doc/$pkgbase/README" install -Dm644 INSTALL "$pkgdir/usr/share/doc/$pkgbase/INSTALL" install -Dm644 NEWS "$pkgdir/usr/share/doc/$pkgbase/NEWS" install -Dm644 UPGRADE "$pkgdir/usr/share/doc/$pkgbase/UPGRADE" - install -Dm755 "$srcdir/mfsmaster" "$pkgdir/etc/rc.d/mfsmaster" - install -Dm755 "$srcdir/mfsmetalogger" "$pkgdir/etc/rc.d/mfsmetalogger" - install -Dm755 "$srcdir/mfscgiserv" "$pkgdir/etc/rc.d/mfscgiserv" + + msg2 'Packaging Systemd services and initscripts...' + for fn in master metalogger cgiserv; do + install -Dm755 "$srcdir/mfs$fn" "$pkgdir/etc/rc.d/mfs$fn" + install -Dm644 "$srcdir/mfs$fn.service" \ + "$pkgdir/usr/lib/systemd/system/mfs$fn.service" + done + + msg2 'Python2 fix...' + sed -i '0,/on/s//on2/' \ + "$pkgdir/usr/sbin/mfscgiserv" \ + "$pkgdir/usr/share/mfscgi/chart.cgi" \ + "$pkgdir/usr/share/mfscgi/mfs.cgi" + + msg2 'Cleaning up...' rmdir "$pkgdir/usr/share/man/man1" mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" - sed -i '0,/on/s//on2/' "$pkgdir/usr/bin/mfscgiserv" } # vim:set ts=2 sw=2 et: diff --git a/community/mfs/mfs.install b/community/mfs/mfs.install new file mode 100644 index 000000000..906932aaa --- /dev/null +++ b/community/mfs/mfs.install @@ -0,0 +1,25 @@ +post_upgrade() { + # Moving the old configuration to the new location at /etc/mfs/ + for fn in chunkserver hdd mount metalogger master exports topology; do + if [ -e /etc/mfs$fn.cfg -a ! -e /etc/mfs/mfs$fn.cfg ]; then + echo "Moving /etc/mfs$fn.cfg to /etc/mfs/mfs$fn.cfg" + mv /etc/mfs$fn.cfg /etc/mfs/mfs$fn.cfg + fi + done +} + +post_install() { + post_upgrade + echo + echo 'For configuring MooseFS, the .cfg.dist files in /etc/mfs can' + echo 'be used as a basis for writing the corresponding .cfg files.' + echo + echo 'To troubleshoot a service, like "mfschunkserver", just running' + echo '"/usr/bin/mfschunkserver start" can be helpful.' + echo + echo '"systemctl enable mfschunkserver" can be used to enable a service' + echo "at boot, if you're using systemd." + echo +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mfs/mfscgiserv.service b/community/mfs/mfscgiserv.service new file mode 100644 index 000000000..09daf41b7 --- /dev/null +++ b/community/mfs/mfscgiserv.service @@ -0,0 +1,13 @@ +[Unit] +Description=Distributed file system (web interface) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfscgiserv +ExecStop=/bin/kill -15 $MAINPID +PIDFile=/run/mfs/mfscgiserv.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mfs/mfschunkserver.service b/community/mfs/mfschunkserver.service new file mode 100644 index 000000000..83ef11adc --- /dev/null +++ b/community/mfs/mfschunkserver.service @@ -0,0 +1,14 @@ +[Unit] +Description=Distributed file system (chunk server) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfschunkserver start +ExecStop=/usr/bin/mfschunkserver stop +ExecReload=/usr/bin/mfschunkserver reload +PIDFile=/run/mfs/mfschunkserver.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mfs/mfsmaster.service b/community/mfs/mfsmaster.service new file mode 100644 index 000000000..410774f9a --- /dev/null +++ b/community/mfs/mfsmaster.service @@ -0,0 +1,13 @@ +[Unit] +Description=Distributed file system (master) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfsmaster start +ExecStop=/usr/bin/mfsmaster stop +PIDFile=/run/mfs/mfsmaster.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mfs/mfsmetalogger.service b/community/mfs/mfsmetalogger.service new file mode 100644 index 000000000..611afc532 --- /dev/null +++ b/community/mfs/mfsmetalogger.service @@ -0,0 +1,13 @@ +[Unit] +Description=Distributed file system (meta logger) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfsmetalogger start +ExecStop=/usr/bin/mfsmetalogger stop +PIDFile=/run/mfs/mfsmetalogger.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 6fd39e952..b4345c6ef 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73966 2012-07-17 18:24:40Z cbrannon $ +# $Id: PKGBUILD 75327 2012-08-19 20:51:39Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey -pkgver=3.1.2 -pkgrel=2 +pkgver=3.1.3 +pkgrel=1 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" @@ -19,6 +19,9 @@ install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 mldonkeyd mldonkey.conf) +md5sums=('671f60467a918a9b7c2affef63ff5c25' + '9e90003a012cf17b548dcc647961ffa6' + '1f86d92db51c62cded0e6f3833057dee') build() { cd "$srcdir/$pkgname-$pkgver" @@ -39,6 +42,3 @@ package() { install -Dm644 "distrib/mldonkey.desktop" \ "$pkgdir/usr/share/applications/mldonkey.desktop" } -md5sums=('85e6a0fe358b8c71a71da6d979c9760f' - '9e90003a012cf17b548dcc647961ffa6' - '1f86d92db51c62cded0e6f3833057dee') diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 4cf9443d0..a1b45f2e5 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72974 2012-06-25 18:51:32Z foutrelis $ +# $Id: PKGBUILD 75316 2012-08-19 08:00:44Z heftig $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.13 -pkgrel=2 +pkgrel=4 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" @@ -12,6 +12,7 @@ license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') makedepends=('pstreams' 'python2-nose' 'ttf-liberation') source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") +md5sums=('b5327c5949057711a8250dffb6ccfd2d') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -30,4 +31,3 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } -md5sums=('b5327c5949057711a8250dffb6ccfd2d') diff --git a/community/tcpflow/PKGBUILD b/community/tcpflow/PKGBUILD index e6bc5469d..2ac149074 100644 --- a/community/tcpflow/PKGBUILD +++ b/community/tcpflow/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69671 2012-04-22 09:26:57Z cbrannon $ +# $Id: PKGBUILD 75325 2012-08-19 20:50:53Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Jeff Mickey <jeff@archlinux.org> pkgname=tcpflow -pkgver=1.2.6 +pkgver=1.2.9 pkgrel=1 pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" arch=('i686' 'x86_64') @@ -11,6 +11,7 @@ url="http://afflib.org/software/tcpflow" license=('GPL') depends=('gcc-libs' 'libpcap' 'zlib') source=("https://github.com/downloads/simsong/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('99e2fbbc6ab8db03a1a9b935689dd407') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,4 +23,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('7562f8a1a65f1ce1238be84a1fe83bf6') diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index ccad37990..9716dc011 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162059 2012-06-19 10:13:06Z andrea $ +# $Id: PKGBUILD 165443 2012-08-19 15:34:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc='A Qt library that implements the Open Collaboration Services API' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') depends=('qt') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2de3a49d79884ed3ce9df491bf35a86b') +md5sums=('b90983ec5d79e5ddcbc9146fa23cab72') build() { cd "${srcdir}" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 7eb040e06..c10db20f4 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164831 2012-08-06 23:07:05Z andrea $ +# $Id: PKGBUILD 165426 2012-08-19 07:57:30Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -13,7 +13,6 @@ pkgname=('calligra-filters' 'calligra-tools' 'calligra-karbon' 'calligra-kexi' - 'calligra-kounavail' 'calligra-plan' 'calligra-stage' 'calligra-krita' @@ -22,22 +21,21 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.4.3 -pkgrel=3 +pkgver=2.5.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' 'kdegraphics-okular' 'gsl' 'kdeedu-marble' - 'libwpd' 'libwpg' 'pstoedit' 'glew' + 'libwps' 'libwpg' 'pstoedit' 'glew' 'fftw' 'opengtl' 'lcms2' 'libkdcraw') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('469d639f17e3d6a186baabd899147e39') +md5sums=('bea9b5e9d95691caaba385ef5522a60d') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -51,7 +49,8 @@ build() { package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" - optdepends=('libwpg: Corel WordPerfect Graphics image importer') + optdepends=('libwpg: Corel WordPerfect Graphics image importer' + 'libwps: Microsoft Works file word processor format import') conflicts=('koffice-filters') replaces=('koffice-filters') install=calligra-filters.install @@ -162,16 +161,6 @@ package_calligra-kexi() { make DESTDIR="${pkgdir}" install } -package_calligra-kounavail() { - pkgdesc="Unavailable Calligra Document" - depends=('calligra-libs') - conflicts=('koffice-kounavail') - replaces=('koffice-kounavail') - - cd "${srcdir}"/build/kounavail - make DESTDIR="${pkgdir}" install -} - package_calligra-plan() { pkgdesc="Calligra Project Management Component" depends=('calligra-words') diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 4d33eec6c..17578c147 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162356 2012-06-25 18:50:49Z foutrelis $ +# $Id: PKGBUILD 165428 2012-08-19 07:57:43Z andyrtr $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.3.1 -pkgrel=4 +pkgrel=5 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 099f64e0c..423774ecc 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163246 2012-07-11 20:12:36Z andyrtr $ +# $Id: PKGBUILD 165429 2012-08-19 07:58:11Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -24,15 +24,15 @@ pkgname=('libreoffice-common' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.5.3 -pkgver=3.5.5 +_LOver=3.5.6.2 +pkgver=3.5.6 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'poppler>=0.20.3' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' #'saxon' - currently broken @@ -52,7 +52,7 @@ _additional_source_url="http://dev-www.libreoffice.org/src" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 + ${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -83,7 +83,7 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 fix_broken_hebrew_wordwrapping.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 +noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -112,12 +112,12 @@ noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a' - '09153713133bddc49af99bd76129e929' - 'c2e66522b8adf0b3fb5789e295129ba9' +md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1' + 'ecf485e13adfe8d5d4428b68787d390f' + '41696d482cb90db0acb6c45acd9047ea' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' - 'a9a1db27688bad49418667b434d29c1f' + '94e7f271e38c976462558b4278590178' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -508,7 +508,7 @@ package_libreoffice-kde4() { } package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." + pkgdesc="Equation Editor Application for LibreOffice." depends=('libreoffice-common') optdepends=() backup=() @@ -579,7 +579,7 @@ package_libreoffice-sdk-doc() { } package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." + pkgdesc="Word Processor Application for LibreOffice." install=libreoffice-writer.install depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') diff --git a/extra/libreoffice/PKGBUILD.36 b/extra/libreoffice/PKGBUILD.36 index b5dc0bee1..71ee72c1c 100644 --- a/extra/libreoffice/PKGBUILD.36 +++ b/extra/libreoffice/PKGBUILD.36 @@ -24,14 +24,14 @@ pkgname=('libreoffice-common' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.6.0.0.beta3 -pkgver=3.6.0beta3 +_LOver=3.6.0.4 +pkgver=3.6.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' @@ -46,8 +46,8 @@ makedepends=( # makedepends # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz @@ -113,9 +113,9 @@ noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('2f471473f405a373e8d9ca5870d3861d' - '0db44b0cc908fe4288d40d3869137d76' - '4b2f46f015c1112f9b65f9ed8ba409b6' +md5sums=('67cf97e86c75363238a371f64ef5f606' + '8422b0c4c797abeefed3ee4490586dd2' + '6cc8fa86be8c657ba23434c6c8d99416' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' 'a9a1db27688bad49418667b434d29c1f' @@ -505,7 +505,7 @@ package_libreoffice-kde4() { } package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." + pkgdesc="Equation Editor Application for LibreOffice." depends=('libreoffice-common') optdepends=() backup=() @@ -576,7 +576,7 @@ package_libreoffice-sdk-doc() { } package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." + pkgdesc="Word Processor Application for LibreOffice." install=libreoffice-writer.install depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index fec031e0a..4e883f1f1 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165215 2012-08-13 11:40:04Z giovanni $ +# $Id: PKGBUILD 165449 2012-08-19 19:05:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.08.12 +pkgver=2012.08.17 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('e3f79923221cb023767778d2352023fb') +md5sums=('8bb807d9ac435d4030a38466f8236117') build() { cd ${srcdir}/live diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index c7be9147d..973985940 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 164697 2012-08-03 07:57:29Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 165439 2012-08-19 15:29:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.27 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL') url="https://www.mysql.com/products/community/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" - 'mysqld' - 'my.cnf') + 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') md5sums=('82baf46acfced6eef072e9d8a479c86e' - '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6') + 'e7eb2faeab755cbb2fe03542bf328da9' + '1c949c0dbea5206af0db14942d9927b6' + '6ea6ceb360d09a774e87335ee098ddd5' + '2fa6e456964d4ff5e6d4f9ff0126aed6' + 'a0e1460c276a50a9666c331de83271f2') build() { - cd "${srcdir}" mkdir build cd build @@ -31,7 +31,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ -DDEFAULT_CHARSET=utf8 \ -DDEFAULT_COLLATION=utf8_general_ci \ -DENABLED_LOCAL_INFILE=ON \ @@ -68,7 +68,7 @@ package_libmysqlclient(){ pkgdesc="MySQL client libraries" depends=('openssl') - cd "${srcdir}"/build + cd build for dir in include libmysql libmysqld libservices; do make -C ${dir} DESTDIR="${pkgdir}" install done @@ -85,7 +85,7 @@ package_mysql-clients(){ pkgdesc="MySQL client tools" depends=('libmysqlclient') - cd "${srcdir}"/build + cd build make -C client DESTDIR="${pkgdir}" install # install man pages @@ -102,15 +102,18 @@ package_mysql(){ pkgdesc="A fast SQL database server" backup=('etc/mysql/my.cnf') install=mysql.install - depends=('mysql-clients') - optdepends=('perl-dbi' 'perl-dbd-mysql') + depends=('mysql-clients' 'systemd-tools') options=('emptydirs') - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/mysqld "${pkgdir}"/etc/rc.d/mysqld + install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post + install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf + install -d "${pkgdir}"/usr/lib/systemd/system + install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/ # provided by libmysqlclient rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} diff --git a/extra/mysql/mysql.install b/extra/mysql/mysql.install index 9a4479215..a98f1a877 100644 --- a/extra/mysql/mysql.install +++ b/extra/mysql/mysql.install @@ -3,6 +3,8 @@ post_install(){ useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null usr/bin/mysql_install_db --user=mysql --basedir=/usr chown -R mysql:mysql var/lib/mysql &>/dev/null + + usr/bin/systemd-tmpfiles --create mysqld.conf } post_upgrade(){ diff --git a/extra/mysql/mysqld-post.sh b/extra/mysql/mysqld-post.sh new file mode 100755 index 000000000..8dc9c4eea --- /dev/null +++ b/extra/mysql/mysqld-post.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +while true; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 +done diff --git a/extra/mysql/mysqld-tmpfile.conf b/extra/mysql/mysqld-tmpfile.conf new file mode 100644 index 000000000..6883dc798 --- /dev/null +++ b/extra/mysql/mysqld-tmpfile.conf @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - diff --git a/extra/mysql/mysqld.rc b/extra/mysql/mysqld.rc new file mode 100755 index 000000000..4bbddb5a4 --- /dev/null +++ b/extra/mysql/mysqld.rc @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MySQL Server" + [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MySQL Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/mysql/mysqld.service b/extra/mysql/mysqld.service new file mode 100644 index 000000000..0175c685b --- /dev/null +++ b/extra/mysql/mysqld.service @@ -0,0 +1,11 @@ +[Unit] +Description=MySQL Server + +[Service] +User=mysql +ExecStart=/usr/bin/mysqld --user=mysql +ExecStartPost=/usr/bin/mysqld-post +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 77bc6efca..a8dc4f428 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 162023 2012-06-18 22:10:13Z ibiru $ +# $Id: PKGBUILD 165445 2012-08-19 16:04:33Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.13.5 +pkgver=3.13.6 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.1 +_nsprver=4.9.2 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') @@ -16,19 +16,21 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-no-rpath.patch nss.pc.in nss-config.in - add_spi+cacert_ca_certs.patch - ssl-renegotiate-transitional.patch) -sha1sums=('22cfe2cbccc93189699e6eed283eca288b45f6cb' + ssl-renegotiate-transitional.patch + add_spi+cacert_ca_certs.patch) +sha1sums=('1f86a7c787e8fe3ebd1dd1cce127e57fb347dac3' 'c8fcdb153af9d39689243119adb475905a657284' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' - '3d89f29e321d7df7269b7ae6d219654543feaa6a' - '8a964a744ba098711b80c0d279a2993524e8eb92') + '8a964a744ba098711b80c0d279a2993524e8eb92' + 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3') build() { cd "${srcdir}/${pkgname}-${pkgver}/mozilla" - # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only - patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch" + # Add CAcert and spi-inc.org CA certificates. + # See http://wiki.cacert.org/NSSLib for how to generate + patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch" + # Adds transitional SSL renegotiate support - patch from Debian patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" # Removes rpath diff --git a/extra/nss/add_spi+cacert_ca_certs.patch b/extra/nss/add_spi+cacert_ca_certs.patch index bf7e2ca16..14c65e0a4 100644 --- a/extra/nss/add_spi+cacert_ca_certs.patch +++ b/extra/nss/add_spi+cacert_ca_certs.patch @@ -1,20 +1,20 @@ -## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds the SPI Inc. and CAcert.org CA certificates - -Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -=================================================================== ---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:32:14.000000000 +0100 -+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:35:07.577861466 +0100 -@@ -23475,3 +23475,558 @@ - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED +--- security/nss/lib/ckfw/builtins/certdata.txt.orig 2012-08-19 16:22:51.726895174 +0200 ++++ security/nss/lib/ckfw/builtins/certdata.txt 2012-08-19 17:40:41.233306703 +0200 +@@ -24454,3 +24454,621 @@ + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ ++ +# +# Certificate "CAcert.org Class 1 Root CA" +# ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 0 (0x0) ++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Not Valid Before: Sun Mar 30 12:29:49 2003 ++# Not Valid After : Tue Mar 29 12:29:49 2033 ++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B ++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE @@ -165,8 +165,15 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\103 +END + -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++# Trust for "CAcert.org Class 1 Root CA" ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 0 (0x0) ++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Not Valid Before: Sun Mar 30 12:29:49 2003 ++# Not Valid After : Tue Mar 29 12:29:49 2033 ++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B ++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33 ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE @@ -191,14 +198,21 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\001\000 +END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "CAcert.org Class 3 Root CA" +# ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 672138 (0xa418a) ++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc. ++# Not Valid Before: Mon May 23 17:48:02 2011 ++# Not Valid After : Thu May 20 17:48:02 2021 ++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42 ++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE @@ -225,120 +239,148 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\100\143\141\143\145\162\164\056\157\162\147 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 ++\002\003\012\101\212 +END +CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 ++\060\202\007\131\060\202\005\101\240\003\002\001\002\002\003\012 ++\101\212\060\015\006\011\052\206\110\206\367\015\001\001\013\005 ++\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157 ++\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025 ++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 ++\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031 ++\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040 ++\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052 ++\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162 ++\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015 ++\061\061\060\065\062\063\061\067\064\070\060\062\132\027\015\062 ++\061\060\065\062\060\061\067\064\070\060\062\132\060\124\061\024 ++\060\022\006\003\125\004\012\023\013\103\101\143\145\162\164\040 ++\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162\164 ++\056\157\162\147\061\034\060\032\006\003\125\004\003\023\023\103 ++\101\143\145\162\164\040\103\154\141\163\163\040\063\040\122\157 ++\157\164\060\202\002\042\060\015\006\011\052\206\110\206\367\015 ++\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 ++\002\001\000\253\111\065\021\110\174\322\046\176\123\224\317\103 ++\251\335\050\327\102\052\213\363\207\170\031\130\174\017\236\332 ++\211\175\341\373\353\162\220\015\164\241\226\144\253\237\240\044 ++\231\163\332\342\125\166\307\027\173\365\004\254\106\270\303\276 ++\177\144\215\020\154\044\363\141\234\300\362\220\372\121\346\365 ++\151\001\143\303\017\126\342\112\102\317\342\104\214\045\050\250 ++\305\171\011\175\106\271\212\363\351\363\064\051\010\105\344\034 ++\237\313\224\004\034\201\250\024\263\230\145\304\103\354\116\202 ++\215\011\321\275\252\133\215\222\320\354\336\220\305\177\012\302 ++\343\353\346\061\132\136\164\076\227\063\131\350\303\003\075\140 ++\063\277\367\321\157\107\304\315\356\142\203\122\156\056\010\232 ++\244\331\025\030\221\246\205\222\107\260\256\110\353\155\267\041 ++\354\205\032\150\162\065\253\377\360\020\135\300\364\224\247\152 ++\325\073\222\176\114\220\005\176\223\301\054\213\244\216\142\164 ++\025\161\156\013\161\003\352\257\025\070\232\324\322\005\162\157 ++\214\371\053\353\132\162\045\371\071\106\343\162\033\076\004\303 ++\144\047\042\020\052\212\117\130\247\003\255\276\264\056\023\355 ++\135\252\110\327\325\175\324\052\173\134\372\106\004\120\344\314 ++\016\102\133\214\355\333\362\317\374\226\223\340\333\021\066\124 ++\142\064\070\217\014\140\233\073\227\126\070\255\363\322\133\213 ++\240\133\352\116\226\270\174\327\325\240\206\160\100\323\221\051 ++\267\242\074\255\365\214\273\317\032\222\212\344\064\173\300\330 ++\154\137\351\012\302\303\247\040\232\132\337\054\135\122\134\272 ++\107\325\233\357\044\050\160\070\040\057\325\177\051\300\262\101 ++\003\150\222\314\340\234\314\227\113\105\357\072\020\012\253\160 ++\072\230\225\160\255\065\261\352\205\053\244\034\200\041\061\251 ++\256\140\172\200\046\110\000\270\001\300\223\143\125\042\221\074 ++\126\347\257\333\072\045\363\217\061\124\352\046\213\201\131\371 ++\241\321\123\021\305\173\235\003\366\164\021\340\155\261\054\077 ++\054\206\221\231\161\232\246\167\213\064\140\321\024\264\054\254 ++\235\257\214\020\323\237\304\152\370\157\023\374\163\131\367\146 ++\102\164\036\212\343\370\334\322\157\230\234\313\107\230\225\100 ++\005\373\351\002\003\001\000\001\243\202\002\015\060\202\002\011 ++\060\035\006\003\125\035\016\004\026\004\024\165\250\161\140\114 ++\210\023\360\170\331\211\167\265\155\305\211\337\274\261\172\060 ++\201\243\006\003\125\035\043\004\201\233\060\201\230\200\024\026 ++\265\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262 ++\071\030\321\241\175\244\173\060\171\061\020\060\016\006\003\125 ++\004\012\023\007\122\157\157\164\040\103\101\061\036\060\034\006 ++\003\125\004\013\023\025\150\164\164\160\072\057\057\167\167\167 ++\056\143\141\143\145\162\164\056\157\162\147\061\042\060\040\006 ++\003\125\004\003\023\031\103\101\040\103\145\162\164\040\123\151 ++\147\156\151\156\147\040\101\165\164\150\157\162\151\164\171\061 ++\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022 ++\163\165\160\160\157\162\164\100\143\141\143\145\162\164\056\157 ++\162\147\202\001\000\060\017\006\003\125\035\023\001\001\377\004 ++\005\060\003\001\001\377\060\135\006\010\053\006\001\005\005\007 ++\001\001\004\121\060\117\060\043\006\010\053\006\001\005\005\007 ++\060\001\206\027\150\164\164\160\072\057\057\157\143\163\160\056 ++\103\101\143\145\162\164\056\157\162\147\057\060\050\006\010\053 ++\006\001\005\005\007\060\002\206\034\150\164\164\160\072\057\057 ++\167\167\167\056\103\101\143\145\162\164\056\157\162\147\057\143 ++\141\056\143\162\164\060\112\006\003\125\035\040\004\103\060\101 ++\060\077\006\010\053\006\001\004\001\201\220\112\060\063\060\061 ++\006\010\053\006\001\005\005\007\002\001\026\045\150\164\164\160 ++\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157\162 ++\147\057\151\156\144\145\170\056\160\150\160\077\151\144\075\061 ++\060\060\064\006\011\140\206\110\001\206\370\102\001\010\004\047 ++\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101\143 ++\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160\150 ++\160\077\151\144\075\061\060\060\120\006\011\140\206\110\001\206 ++\370\102\001\015\004\103\026\101\124\157\040\147\145\164\040\171 ++\157\165\162\040\157\167\156\040\143\145\162\164\151\146\151\143 ++\141\164\145\040\146\157\162\040\106\122\105\105\054\040\147\157 ++\040\164\157\040\150\164\164\160\072\057\057\167\167\167\056\103 ++\101\143\145\162\164\056\157\162\147\060\015\006\011\052\206\110 ++\206\367\015\001\001\013\005\000\003\202\002\001\000\051\050\205 ++\256\104\251\271\257\244\171\023\360\250\243\053\227\140\363\134 ++\356\343\057\301\366\342\146\240\021\256\066\067\072\166\025\004 ++\123\352\102\365\371\352\300\025\330\246\202\331\344\141\256\162 ++\013\051\134\220\103\350\101\262\341\167\333\002\023\104\170\107 ++\125\257\130\374\314\230\366\105\271\321\040\370\330\041\007\376 ++\155\252\163\324\263\306\007\351\011\205\314\073\362\266\276\054 ++\034\045\325\161\214\071\265\056\352\276\030\201\272\260\223\270 ++\017\343\346\327\046\214\061\132\162\003\204\122\346\246\365\063 ++\042\105\012\310\013\015\212\270\066\157\220\011\241\253\275\327 ++\325\116\056\161\242\324\256\372\247\124\053\353\065\215\132\267 ++\124\210\057\356\164\237\355\110\026\312\015\110\320\224\323\254 ++\244\242\366\044\337\222\343\275\353\103\100\221\156\034\030\216 ++\126\264\202\022\363\251\223\237\324\274\234\255\234\165\356\132 ++\227\033\225\347\164\055\034\017\260\054\227\237\373\251\063\071 ++\172\347\003\072\222\216\042\366\214\015\344\331\176\015\166\030 ++\367\001\371\357\226\226\242\125\163\300\074\161\264\035\032\126 ++\103\267\303\012\215\162\374\342\020\011\013\101\316\214\224\240 ++\371\003\375\161\163\113\212\127\063\345\216\164\176\025\001\000 ++\346\314\112\034\347\177\225\031\055\305\245\014\213\273\265\355 ++\205\263\134\323\337\270\271\362\312\307\015\001\024\254\160\130 ++\305\214\215\063\324\235\146\243\032\120\225\043\374\110\340\006 ++\103\022\331\315\247\206\071\057\066\162\243\200\020\344\341\363 ++\321\313\133\032\300\344\200\232\174\023\163\006\117\333\243\153 ++\044\012\272\263\034\274\112\170\273\345\343\165\070\245\110\247 ++\242\036\257\166\324\136\367\070\206\126\132\211\316\326\303\247 ++\171\262\122\240\306\361\205\264\045\214\362\077\226\263\020\331 ++\215\154\127\073\237\157\206\072\030\202\042\066\310\260\221\070 ++\333\052\241\223\252\204\077\365\047\145\256\163\325\310\325\323 ++\167\352\113\235\307\101\273\307\300\343\240\077\344\175\244\215 ++\163\346\022\113\337\241\163\163\163\072\200\350\325\313\216\057 ++\313\352\023\247\326\101\213\254\372\074\211\327\044\365\116\264 ++\340\141\222\267\363\067\230\304\276\226\243\267\212 +END + -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++# Trust for "CAcert.org Class 3 Root CA" ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 672138 (0xa418a) ++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc. ++# Not Valid Before: Mon May 23 17:48:02 2011 ++# Not Valid After : Thu May 20 17:48:02 2021 ++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42 ++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 ++\255\174\077\144\374\104\071\376\364\351\013\350\364\174\154\372 ++\212\255\375\316 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 ++\367\045\022\202\116\147\265\320\215\222\267\174\013\206\172\102 +END +CKA_ISSUER MULTILINE_OCTAL +\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 @@ -351,21 +393,28 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\100\143\141\143\145\162\164\056\157\162\147 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 ++\002\003\012\101\212 +END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" ++# Certificate "Software in the Public Interest" +# ++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28 ++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Not Valid Before: Tue May 13 08:07:56 2008 ++# Not Valid After : Fri May 11 08:07:56 2018 ++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78 ++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_LABEL UTF8 "Software in the Public Interest" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -532,12 +581,19 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\243\140 +END + -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++# Trust for "Software in the Public Interest" ++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28 ++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Not Valid Before: Tue May 13 08:07:56 2008 ++# Not Valid After : Fri May 11 08:07:56 2018 ++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78 ++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_LABEL UTF8 "Software in the Public Interest" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 +\251\220\103\034 @@ -562,7 +618,7 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\011\000\350\216\266\311\370\052\024\050 +END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index d1e213e76..d8e07c8d9 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163501 2012-07-13 16:26:14Z andyrtr $ +# $Id: PKGBUILD 165431 2012-08-19 07:58:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('45dd2c16c8c4d1a39e830e45745c4e25' +md5sums=('28c40266f374e1960a7bcead17d39f96' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index 78759e944..47be71491 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 164987 2012-08-07 20:14:43Z eric $ +# $Id: PKGBUILD 165441 2012-08-19 15:31:22Z andrea $ # Maintainer: # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd pkgver=1.3.4b -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64') url="http://www.proftpd.org" license=('GPL') -depends=('libldap' 'libmysqlclient' 'postgresql-libs') +depends=('libmysqlclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') + 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service') md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2' 'e5b9bd78029a15f82994efcb7ed2e9fb' - '8177292919acb2f087ded0bb7b2dcc32' + 'c439a0a1dbc21b604d8382da87aa021b' 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736') + '71d5932b0461c318ed68c2c0c2660736' + '2c446f531948c8cc0a1e0fae28f8dfda') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,12 +29,13 @@ build() { --disable-pam \ --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ --sysconfdir=/etc \ - --localstatedir=/var/run \ + --localstatedir=/run/proftpd \ --enable-ctrls \ --enable-ipv6 \ --with-includes=/usr/include/mysql:/usr/include/postgresql \ --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls + --enable-nls \ + --with-systemd make } @@ -49,6 +51,6 @@ package() { install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - # /var/run is a symlink to /run now - rm -rf "${pkgdir}/var" + install -d "${pkgdir}/usr/lib/systemd/system/" + install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" } diff --git a/extra/proftpd/proftpd b/extra/proftpd/proftpd index df9283a77..9ea1d47fc 100755 --- a/extra/proftpd/proftpd +++ b/extra/proftpd/proftpd @@ -20,11 +20,11 @@ case "$1" in ;; stop) stat_busy "Stopping ProFTPd Server" - [ -f /run/proftpd.pid ] && kill $(cat /run/proftpd.pid) &> /dev/null + [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm -f /run/proftpd.pid + rm -f /run/proftpd/proftpd.pid rm_daemon proftpd stat_done fi diff --git a/extra/proftpd/proftpd.service b/extra/proftpd/proftpd.service new file mode 100644 index 000000000..c202a2fdf --- /dev/null +++ b/extra/proftpd/proftpd.service @@ -0,0 +1,14 @@ +[Unit] +Description = ProFTPD FTP Server +After = network.target nss-lookup.target local-fs.target remote-fs.target + +[Service] +Type = forking +PIDFile = /run/proftpd/proftpd.pid +Environment = PROFTPD_ARGS= +EnvironmentFile = -/etc/conf.d/proftpd +ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS +ExecReload = /bin/kill -HUP $MAINPID + +[Install] +WantedBy = multi-user.target diff --git a/extra/pyxml/PKGBUILD b/extra/pyxml/PKGBUILD index 2cad98f99..b81767462 100644 --- a/extra/pyxml/PKGBUILD +++ b/extra/pyxml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150964 2012-02-24 10:17:15Z pierre $ +# $Id: PKGBUILD 165447 2012-08-19 17:09:13Z jgc $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=pyxml pkgver=0.8.4 -pkgrel=9 +pkgrel=10 pkgdesc="Python XML parsing library" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/pyxml/" @@ -17,7 +17,7 @@ md5sums=('1f7655050cebbb664db976405fdba209' '4b652e0c866e3cca7e2386e8e383d5ba' 'c9c54fdf0f7d1515a3b7aa34b01d1c46') -package() { +build() { cd "${srcdir}/PyXML-${pkgver}" patch -Np1 -i "${srcdir}/fix-python2.6.patch" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 7f4bc70e3..482306c67 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164263 2012-07-29 10:20:53Z guillaume $ +# $Id: PKGBUILD 165436 2012-08-19 10:42:24Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -12,7 +12,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('629fe03f4a64eb8c7bd9308ee4e22e2e') +md5sums=('5e3ea7eed50dace479e12f49d24506f4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 7bfb6ed50..c479f4379 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165096 2012-08-10 18:33:15Z andyrtr $ +# $Id: PKGBUILD 165425 2012-08-19 07:55:11Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.3 +pkgver=2.20.4 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('effca1382e595cc071b109818150db229ffb54f92769e4758398abbe69acb92c') +sha256sums=('f36d857a64a28b839abc4999e8e8f4704f5769ed284800fecc5dfd2aa03150d8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD new file mode 100644 index 000000000..5eee8985c --- /dev/null +++ b/libre/doublecmd-libre/PKGBUILD @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> +# Contributor: (sirocco AT ngs.ru) + +_pkgbase=doublecmd +pkgbase=doublecmd-libre +pkgname=('doublecmd-gtk2-libre' 'doublecmd-qt-libre') +pkgver=0.5.4 +_helpver=0.5.1 +pkgrel=2.1 +url="http://doublecmd.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +install="$_pkgbase.install" +makedepends=('lazarus' 'qt4pas' 'gtk2') +optdepends=('lua: scripting' 'p7zip: support for 7zip archives') +source=("http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz" + "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz" +) +sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7' + 'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5') + +build() { + cp -a $_pkgbase-$pkgver $_pkgbase-gtk + cp -a $_pkgbase-$pkgver $_pkgbase-qt + + cd "$srcdir/$_pkgbase-gtk" + ./build.sh beta gtk2 + + cd "$srcdir/$_pkgbase-qt" + ./build.sh beta qt +} + +package_doublecmd-gtk2-libre() { + pkgdesc="twin-panel (commander-style) file manager (GTK)" + depends=('gtk2') + conflicts=('doublecmd-gtk2') + replaces=('doublecmd-gtk2') + provides=("doublecmd-gtk2=${pkgver}" 'doublecmd') + cd "$srcdir/$_pkgbase-gtk" + sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh + ./install/linux/install.sh --install-prefix="$pkgdir" + + # install doc + cd "$srcdir/$_pkgbase-help-$_helpver" + cp -a * "$pkgdir/usr/share/$_pkgbase/doc/" +} + +package_doublecmd-qt-libre() { + pkgdesc="twin-panel (commander-style) file manager (QT)" + depends=('qt4pas') + conflicts=('doublecmd-qt') + replaces=('doublecmd-qt') + provides=("doublecmd-qt=${pkgver}" 'doublecmd') + cd "$srcdir/$_pkgbase-qt" + sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh + ./install/linux/install.sh --install-prefix="$pkgdir" + + # install doc + cd "$srcdir/$_pkgbase-help-$_helpver" + cp -a * "$pkgdir/usr/share/$_pkgbase/doc/" +} diff --git a/libre/doublecmd-libre/doublecmd.install b/libre/doublecmd-libre/doublecmd.install new file mode 100644 index 000000000..40d56528f --- /dev/null +++ b/libre/doublecmd-libre/doublecmd.install @@ -0,0 +1,34 @@ +update_icons() { + + # Setup Menus + if which update-desktop-database + then + update-desktop-database -q /usr/share/applications + fi + + # Setup MIME types + if which update-mime-database + then + update-mime-database /usr/share/mime >/dev/null + fi + + # Setup Icons + touch -c /usr/share/icons/hicolor + if which gtk-update-icon-cache + then + gtk-update-icon-cache -tq /usr/share/icons/hicolor + fi + +} + +post_install() { + update_icons +} + +post_upgrade() { + update_icons +} + +post_remove() { + update_icons +} diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD new file mode 100644 index 000000000..3528fba0e --- /dev/null +++ b/libre/mc-libre/PKGBUILD @@ -0,0 +1,69 @@ +# $Id$ +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: schuay <jakob.gruber@gmail.com> + +_pkgname=mc +pkgname=mc-libre +pkgver=4.8.4 +pkgrel=1 +pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" +arch=('i686' 'x86_64') +url="http://www.ibiblio.org/mc/" +license=('GPL') +depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') +makedepends=('libxt' 'libx11') +optdepends=('p7zip: support for 7zip archives' + 'mtools: a+ extfs' + 'cdparanoia: audio extfs' + 'gawk: hp48+ extfs' + 'cdrkit: iso9660 extfs' + 'perl: needed by several extfs scripts' + 'python-boto: s3+ extfs' + 'python2-pytz: s3+ extfs' + 'p7zip: u7z extfs' + 'arj: uarj extfs' + 'cabextract: ucab extfs' + 'ununrar: urar extfs' + 'zip: uzip extfs') +conflicts=('mc') +replaces=('mc') +provides=("mc=${pkgver}") +options=('!emptydirs' '!makeflags') +backup=('etc/mc/edit.indent.rc' + 'etc/mc/edit.spell.rc' + 'etc/mc/filehighlight.ini' + 'etc/mc/mcedit.menu' + 'etc/mc/mc.ext' + 'etc/mc/mc.keymap' + 'etc/mc/mc.menu' + 'etc/mc/sfs.ini') +source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ + --enable-background --enable-charset --enable-largefile \ + --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \ + --with-screen=slang --with-subshell --with-vfs --with-x \ + --without-debug --without-gnome --without-included-gettext \ + --libexecdir=/usr/lib + + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # Fix FS#15177 + sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" + + sed 's#/usr/bin/env python#/usr/bin/python2#' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" +} + +md5sums=('a8edb8226cb25869f925ecce043faf1e') diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index f20ccf9de..ccdcd1efe 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161835 2012-06-15 13:56:53Z ibiru $ +# $Id: PKGBUILD 165434 2012-08-19 10:10:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -13,12 +13,12 @@ if [ "${_git}" = "true" ]; then pkgver=7.10.99.git20110709 #pkgver=7.11 else - pkgver=8.0.3 + pkgver=8.0.4 fi pkgrel=3 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') + 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'systemd-tools') url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE @@ -35,7 +35,7 @@ if [ "${_git}" = "true" ]; then fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171') + 'd546f988adfdf986cff45b1efa2d8a46') build() { cd ${srcdir}/?esa-* @@ -48,7 +48,9 @@ if [ "${_git}" = "true" ]; then --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ --enable-gallium-llvm \ - --enable-gallium-egl \ + --enable-egl \ + --enable-gallium-egl \ + --with-egl-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -57,7 +59,6 @@ if [ "${_git}" = "true" ]; then --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ - --enable-egl \ --enable-texture-float \ --enable-xa \ --enable-shared-dricore @@ -71,7 +72,9 @@ if [ "${_git}" = "true" ]; then --with-gallium-drivers=r300,r600,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,swrast \ --enable-gallium-llvm \ + --enable-egl \ --enable-gallium-egl \ + --with-egl-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -80,7 +83,6 @@ if [ "${_git}" = "true" ]; then --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ - --enable-egl \ --enable-texture-float \ --enable-xa \ --enable-shared-dricore @@ -132,12 +134,15 @@ package_libglapi() { } package_libgbm() { - depends=('glibc') + depends=('systemd-tools') pkgdesc="Mesa gbm library" cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" + install -m755 -d ${pkgdir}/usr/{include,lib/gbm} bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + bin/minstall src/gbm/main/gbm.h "${pkgdir}/usr/include/" + bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + bin/minstall lib/gbm/gbm_gallium_drm.so* "${pkgdir}/usr/lib/gbm/" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" @@ -167,7 +172,7 @@ package_libgles() { } package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'libgbm' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" cd ${srcdir}/?esa-* @@ -218,12 +223,14 @@ package_mesa() { rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" rm -f "${pkgdir}/usr/lib/libOSMesa"* + rm -rf "${pkgdir}/usr/lib/gbm" rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} rm -rf "${pkgdir}/usr/lib/xorg" rm -f "${pkgdir}/usr/include/GL/glew.h" rm -f "${pkgdir}/usr/include/GL/glxew.h" rm -f "${pkgdir}/usr/include/GL/wglew.h" rm -f "${pkgdir}/usr/include/GL/glut.h" + rm -f "${pkgdir}/usr/include/gbm.h" rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} install -m755 -d "${pkgdir}/usr/share/licenses/mesa" @@ -231,7 +238,7 @@ package_mesa() { } package_ati-dri() { - depends=("libgl=${pkgver}") + depends=("libgl=${pkgver}" 'libffi') pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') @@ -241,6 +248,11 @@ package_ati-dri() { # gallium3D driver for r300,r600 make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install + # gallium egl drivers + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib/gbm" + bin/minstall lib/gbm/pipe_r{300,600}.so* "${pkgdir}/usr/lib/gbm/" + } package_intel-dri() { @@ -262,8 +274,12 @@ package_nouveau-dri() { } package_svga-dri() { - depends=("mesa=${pkgver}") + depends=("mesa=${pkgver}" 'libffi') pkgdesc="Gallium3D VMware guest GL driver" make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install + # gallium egl driver + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib/gbm" + bin/minstall lib/gbm/pipe_vmwgfx.so* "${pkgdir}/usr/lib/gbm/" } diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD index 410a3dd2b..3d7d1fa9f 100644 --- a/~fauno/pandoc/PKGBUILD +++ b/~fauno/pandoc/PKGBUILD @@ -5,15 +5,19 @@ pkgname=pandoc pkgver=1.9.4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') makedepends=('ghc' 'sh' 'cabal-install') -options=('strip') -source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig} SRCBUILD) +options=(strip !makeflags !distcc) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) conflicts=('haskell-pandoc') +optdepends=('texlive-most: for pdf creation') +md5sums=('15f522c6bd0e26c709579b0a0fcfdcea' + 'e86da5aad2a7dfc6d53d2a2a0c562baa' + '415bbf263863c5cbc7c672ec1f497893') # PKGBUILD functions build() { @@ -24,7 +28,7 @@ build() { pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --prefix=${srcdir}/build/usr + cabal install --flags="embed_data_files" --prefix=${srcdir}/build/usr popd done @@ -32,7 +36,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver} HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library" + cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library embed_data_files" HOME=${srcdir}/${pkgname}-${pkgver} \ cabal build @@ -44,6 +48,10 @@ package() { runghc Setup.hs copy --destdir=${pkgdir}/ +# EC is unfree and makes Parabola TeXLive cry +# besides, it's unneeded + sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex + # runghc Setup.hs configure --prefix=DIR --bindir=DIR --libdir=DIR \ # --datadir=DIR --libsubdir=DIR --datasubdir=DIR --docdir=DIR \ # --htmldir=DIR --program-prefix=PREFIX --program-suffix=SUFFIX \ @@ -57,6 +65,3 @@ package() { find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; } -md5sums=('3a9191e729a4547370f756ba831cad77' - 'a8da851ee560ce54c7c5044dfb5042f0' - '8dab4575128cf33941a577bfb500c417') diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD index 68939a103..29c5f25ae 100644 --- a/~fauno/pandoc/SRCBUILD +++ b/~fauno/pandoc/SRCBUILD @@ -3,7 +3,7 @@ pkgname=pandoc pkgver=1.9.4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -20,12 +20,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch ${pkgname}-${pkgver} + cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver} msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run ${pkgname}-${pkgver} | tail -n+3 > BUILDORDER + cabal install --dry-run file-embed ${pkgname}-${pkgver} | tail -n+3 >> BUILDORDER } package() { diff --git a/~fauno/sphinx/PKGBUILD b/~fauno/sphinx/PKGBUILD new file mode 100644 index 000000000..fa5a7935e --- /dev/null +++ b/~fauno/sphinx/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: dryes <joswiseman@gmail> +# Contributor: Dan Serban +# Contributor: Vishnevsky Roman <aka dot x0x01 at gmail dot com> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +pkgname='sphinx' +pkgver=2.0.5 +pkgrel=2 +pkgdesc='Free open-source SQL full-text search engine.' +arch=('i686' 'x86_64') +url='http://www.sphinxsearch.com/' +license=('GPL') +depends=('unixodbc' 'expat' 'libmysqlclient' 'postgresql-libs') +optdepends=('postgresql') +backup=('etc/conf.d/sphinx') +source=("http://sphinxsearch.com/files/${pkgname}-${pkgver}-release.tar.gz" 'sphinx.conf.d' 'sphinx.rc.d') + +build() { + sed -i '15199,15199 s/x00/x21/' "${srcdir}/${pkgname}-${pkgver}-release/src/searchd.cpp" + + cd "${srcdir}/${pkgname}-${pkgver}-release" + ./configure --prefix=/usr --exec-prefix=/usr --localstatedir=/var/lib/sphinx \ + --sysconfdir=/etc/sphinx --with-pgsql --enable-id64 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-release" + + make DESTDIR="${pkgdir}" install + + for _f in "${pkgdir}/usr/bin/"*; do + ln -s "/usr/bin/${_f##*/}" "${pkgdir}/usr/bin/sphinx-${_f##*/}" + done + + install -Dm755 "${srcdir}/sphinx.rc.d" "${pkgdir}/etc/rc.d/sphinx" + install -Dm644 "${srcdir}/sphinx.conf.d" "${pkgdir}/etc/conf.d/sphinx" +} + +md5sums=('e71fdb5b0c2911247d48fb30550b9584' + '48e3e1857919d26d5104a48caffb531b' + 'd886222593c6bba891fd3ce982c90c00') diff --git a/~fauno/sphinx/sphinx.conf.d b/~fauno/sphinx/sphinx.conf.d new file mode 100644 index 000000000..c809e56fa --- /dev/null +++ b/~fauno/sphinx/sphinx.conf.d @@ -0,0 +1,5 @@ +# +# Arguments to be passed to the sphinx daemon +# + +SPHINX_ARGS="" diff --git a/~fauno/sphinx/sphinx.rc.d b/~fauno/sphinx/sphinx.rc.d new file mode 100644 index 000000000..64c8f01e7 --- /dev/null +++ b/~fauno/sphinx/sphinx.rc.d @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sphinx + +PID=$(pidof -o %PPID /usr/bin/sphinx-searchd) +case $1 in +start) + stat_busy "Starting Sphinx Daemon" + + if [[ -z $PID ]] && /usr/bin/sphinx-searchd $SPHINX_ARGS; then + + PID=$(pidof -o %PPID /usr/bin/sphinx-searchd) + echo "$PID" > /var/run/sphinx-searchd.pid + add_daemon sphinx + stat_done + else + stat_fail + exit 1 + fi + ;; + +stop) + stat_busy "Stopping Sphinx Daemon" + if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then + rm_daemon sphinx + stat_done + else + stat_fail + exit 1 + fi + ;; + +restart) + $0 stop + $0 start + ;; + +*) + echo "Usage: $0 {start|stop|restart}" >&2 + exit 1 + +esac |