diff options
204 files changed, 217 insertions, 7217 deletions
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index 38100b693..f2484acbd 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72784 2012-06-22 12:49:49Z dreisner $ +# $Id: PKGBUILD 75347 2012-08-20 19:15:16Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> @@ -8,7 +8,7 @@ pkgname=chrony pkgver=1.26 -pkgrel=3 +pkgrel=5 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64' 'mips64el') url="http://chrony.tuxfamily.org/" @@ -36,4 +36,7 @@ package() { install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service + + install -dm755 "$pkgdir/usr/lib/ntp-units.d" + echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" } diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index 0f622554b..4c2b0ee2d 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74707 2012-08-02 09:04:30Z bpiotrowski $ +# $Id: PKGBUILD 75333 2012-08-20 06:45:01Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,8 +6,8 @@ # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=1 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64' 'mips64el') url="http://mupdf.com" @@ -15,19 +15,19 @@ license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('d986ab98e2b035b7abd61afc474562b3') +md5sums=('f7b5fd753f40aca207e9afd70d8f8edf') build() { CFLAGS+=" -fPIC" CXXFLAGS+=" -fPIC" cd "$srcdir"/$pkgname-$pkgver-source - make build=release prefix="$pkgdir/usr" + make build=release prefix="$pkgdir"/usr } package() { cd "$srcdir"/$pkgname-$pkgver-source - make build=release prefix="$pkgdir/usr" install + make build=release prefix="$pkgdir"/usr install sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index 37aaa3ccb..645bd923b 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72171 2012-06-09 14:07:36Z dreisner $ +# $Id: PKGBUILD 75345 2012-08-20 19:14:50Z dreisner $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch) @@ -6,7 +6,7 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=15 +pkgrel=18 pkgdesc="Free, easy to use implementation of the Network Time Protocol." url="http://www.openntpd.org/" arch=('x86_64' 'i686' 'mips64el') @@ -21,7 +21,7 @@ sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49' '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96' '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2' 'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5' - 'b54b88cb0fe35636405e2b09744633cd815edb3e8c864035bcdb05f727858f53') + '7ad4d3ce4af3a6ff47ba2e5428092139666ad821101dafe1599b209d53f6943f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -52,6 +52,9 @@ package() { # avoid conflict with filesystem>=2012.06 rm -r "$pkgdir/run" + + install -dm755 "$pkgdir/usr/lib/ntp-units.d" + echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" } # vim:set ts=2 sw=2 et: diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install index 42063ef21..4f42aeb1f 100644 --- a/community/openntpd/openntpd.install +++ b/community/openntpd/openntpd.install @@ -10,7 +10,7 @@ createuser() { post_install() { createuser - systemd-tmpfiles --create /usr/lib/tmpfiles.d/openntpd.conf + systemd-tmpfiles --create openntpd.conf } post_upgrade() { diff --git a/community/openntpd/openntpd.service b/community/openntpd/openntpd.service index db76531d1..e419204d4 100644 --- a/community/openntpd/openntpd.service +++ b/community/openntpd/openntpd.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/ntpd +ExecStart=/usr/sbin/ntpd -s [Install] WantedBy=multi-user.target diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 7d5e5226e..5a4fea726 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162200 2012-06-23 12:13:11Z ronald $ +# $Id: PKGBUILD 165491 2012-08-20 23:01:53Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.4.0 -pkgrel=2 +pkgver=3.5.1 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -20,7 +20,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch) -sha1sums=('fcea492dea2f3ecf9d35f279e2f1a7ea6ca0d527' +sha1sums=('461f3e97d84264a597176de3ba94633114959df5' '35b8cf2dc94b73eccad427235c07596146cd6f6c') build() { diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD index 611229827..3f8fefe84 100644 --- a/core/rfkill/PKGBUILD +++ b/core/rfkill/PKGBUILD @@ -1,37 +1,39 @@ -# $Id: PKGBUILD 156346 2012-04-17 15:19:00Z bisson $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> +# $Id: PKGBUILD 165479 2012-08-20 14:46:54Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rfkill pkgver=0.4 -pkgrel=4 -pkgdesc="A tool for enabling and disabling wireless devices" -arch=('i686' 'x86_64' 'mips64el') -url="http://linuxwireless.org/en/users/Documentation/rfkill" +pkgrel=5 +pkgdesc='Tool for enabling and disabling wireless devices' +url='http://linuxwireless.org/en/users/Documentation/rfkill' license=('custom') -source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - 60-rfkill.rules - rfkill.conf.d - rfkill.rc.d) -backup=(etc/conf.d/rfkill) -md5sums=('727892c0fb35c80ee3849fbe89b45350' - '63f9bf9264911242e430867a41e8918c' - '398e7cadf023e05e3e0c323aa33575b9' - '793f0510e26547eb2632efce7d16e50e') +arch=('i686' 'x86_64' 'mips64el') +source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'rules.d' + 'service' + 'conf.d' + 'rc.d') +sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b' + '6390eaa793b473098aaa11b13c5254d611a4c13a' + 'cadc563f967c5ac680e7cdfd764718b412201f8a' + 'd969fe927a9fb2926af43a311a7c1fa126fe59a9' + '380af0b002f51543557306ed68a27f0059fd5a6f') + +backup=('etc/conf.d/rfkill') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make + cd "${srcdir}/${pkgname}-${pkgver}" + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # License - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - # Udev rule - install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" - # Init script - install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill" - install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service" + install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill" + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill" } diff --git a/testing/rfkill/conf.d b/core/rfkill/conf.d index 4483da26c..4483da26c 100644 --- a/testing/rfkill/conf.d +++ b/core/rfkill/conf.d diff --git a/testing/rfkill/rc.d b/core/rfkill/rc.d index ce90ee150..ce90ee150 100755 --- a/testing/rfkill/rc.d +++ b/core/rfkill/rc.d diff --git a/testing/rfkill/rules.d b/core/rfkill/rules.d index bc98a3bef..bc98a3bef 100644 --- a/testing/rfkill/rules.d +++ b/core/rfkill/rules.d diff --git a/testing/rfkill/service b/core/rfkill/service index decd5b6fc..decd5b6fc 100644 --- a/testing/rfkill/service +++ b/core/rfkill/service diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index c10db20f4..51081072d 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165426 2012-08-19 07:57:30Z andyrtr $ +# $Id: PKGBUILD 165455 2012-08-20 08:43:02Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -22,15 +22,14 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.5.0 -pkgrel=1 +pkgrel=2 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' - 'libwps' 'libwpg' 'pstoedit' 'glew' - 'fftw' 'opengtl' 'lcms2' 'libkdcraw') +makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' + 'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg' + 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' + 'openjpeg' 'kdegraphics-okular' 'pstoedit') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") md5sums=('bea9b5e9d95691caaba385ef5522a60d') @@ -41,9 +40,7 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_active=OFF \ - -DBUILD_mobile=OFF \ - -DIHAVEPATCHEDQT=1 + -DBUILD_active=OFF make } @@ -132,7 +129,7 @@ package_calligra-tools() { package_calligra-karbon() { pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') + depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime' 'pstoedit') optdepends=('calligra-filters: import/export filters' 'calligra-tools: extra calligra tools') conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') @@ -145,7 +142,7 @@ package_calligra-karbon() { package_calligra-kexi() { pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'calligra-templates') + depends=('calligra-libs' 'calligra-templates' 'glew' 'fftw') optdepends=('libmysqlclient: MySQL driver' 'libpqxx: PostgreSQL driver' 'freetds: Sybase & MS SQL driver' @@ -159,6 +156,8 @@ package_calligra-kexi() { cd "${srcdir}"/build/kexi make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kexi + make DESTDIR="${pkgdir}" install } package_calligra-plan() { @@ -182,12 +181,14 @@ package_calligra-stage() { cd "${srcdir}"/build/stage make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/stage + make DESTDIR="${pkgdir}" install } package_calligra-krita() { pkgdesc="Edit and paint images" - depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' - 'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw') + depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' 'eigen2' + 'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl') conflicts=('koffice-krita' 'calligra-krita-doc') replaces=('koffice-krita' 'calligra-krita-doc') install=calligra-krita.install @@ -198,7 +199,7 @@ package_calligra-krita() { package_calligra-sheets() { pkgdesc="Write spreadsheet documents" - depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime') + depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime' 'eigen2') optdepends=('calligra-filters: import/export filters' 'calligra-plugins: extra calligra plugins' 'calligra-tools: extra calligra tools') @@ -208,12 +209,13 @@ package_calligra-sheets() { cd "${srcdir}"/build/sheets make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/sheets + make DESTDIR="${pkgdir}" install } package_calligra-words() { pkgdesc="Word Processor" - depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail' - 'calligra-plugins' 'kdegraphics-okular') + depends=('calligra-templates' 'calligra-pics' 'calligra-plugins' 'kdegraphics-okular') optdepends=('calligra-tools: extra calligra tools') conflicts=('koffice-kword') replaces=('koffice-kword') @@ -227,6 +229,7 @@ package_calligra-handbook() { pkgdesc="Documentation for Calligra" conflicts=('koffice-handbook') replaces=('koffice-handbook') + options=('docs') cd "${srcdir}"/build/doc/calligra make DESTDIR="${pkgdir}" install @@ -243,7 +246,7 @@ package_calligra-braindump() { package_calligra-flow() { pkgdesc="Flowchart & Diagram Editing" - depends=('calligra-words' 'kdebase-runtime') + depends=('calligra-words') conflicts=('calligra-flow-doc') replaces=('calligra-flow-doc') install=calligra-flow.install diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index 36d3e8f4f..d56622cce 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 148702 2012-02-05 11:47:33Z ibiru $ +# $Id: PKGBUILD 165483 2012-08-20 17:27:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> # Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> pkgname=dvdauthor -pkgver=0.7.0 -pkgrel=4 +pkgver=0.7.1 +pkgrel=1 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64' 'mips64el') url="http://dvdauthor.sourceforge.net/" license=('GPL') depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'dvdauthor-0.7.0-libpng15.patch') -md5sums=('33a447fb98ab3293ac40f869eedc17ff' - '9ea90bbea6adb0469c8c1b2f7d033f11') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('2694a5a3ef460106ea3caf0f7f60ff80') build() { cd "${srcdir}/${pkgname}" - patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch" - ./configure --prefix=/usr \ --sysconfdir=/etc make diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index c3ccbebb6..f6cc28265 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160147 2012-05-29 23:00:04Z giovanni $ +# $Id: PKGBUILD 165451 2012-08-20 08:01:40Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +11,15 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('efc86557e9b54e5c3becb598a50684a0') +md5sums=('3260bdc49e72ccc9dc63b1e2fb02eae5') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --enable-ipv4 \ + --enable-ipv6 make } diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index bb30981e5..04fb89499 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,7 +2,8 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=1.0.3 +_realver=1.0.3 +pkgver=1.0.3.20110809 pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') @@ -11,22 +12,29 @@ license=('GPL') depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) backup=(etc/conf.d/irqbalance) -source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz +source=(http://irqbalance.googlecode.com/files/irqbalance-$_realver.tar.gz + irqbalance-2011-08-09.patch irqbalance.conf.d - irqbalance.rc.d) + irqbalance.rc.d + irqbalance.service) md5sums=('6f246481d6295bcb9a79751c03207c96' + '49a5669fc3eb452a5d24abec887f0a6a' '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c') + 'fb82fc5d267d39110baf720d81282a7c' + '9e82dc471128117982a8dd0c4bd5f246') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_realver" + patch -Np1 < ../irqbalance-2011-08-09.patch + autoreconf -fi ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_realver" make install DESTDIR="$pkgdir" install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance + install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service } diff --git a/testing/irqbalance/irqbalance-2011-08-09.patch b/extra/irqbalance/irqbalance-2011-08-09.patch index fcdb8bdbf..fcdb8bdbf 100644 --- a/testing/irqbalance/irqbalance-2011-08-09.patch +++ b/extra/irqbalance/irqbalance-2011-08-09.patch diff --git a/testing/irqbalance/irqbalance.service b/extra/irqbalance/irqbalance.service index 372ac0aa4..372ac0aa4 100644 --- a/testing/irqbalance/irqbalance.service +++ b/extra/irqbalance/irqbalance.service diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 23f4477b2..fd418a3c2 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164828 2012-08-06 23:06:24Z andrea $ +# $Id: PKGBUILD 165471 2012-08-20 13:27:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" -url='https://projects.kde.org/projects/kdereview/libkgoogle' +url='https://projects.kde.org/projects/extragear/libs/libkgapi' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') depends=('kdepimlibs' 'qjson') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b4cefa643e95f5670997b5001547988f') +md5sums=('7da940eb4ed9bdb909d29e93ef6bce67') build() { cd "${srcdir}" diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index b9addc072..3fe8e6854 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163710 2012-07-18 01:05:42Z ibiru $ +# $Id: PKGBUILD 165473 2012-08-20 13:43:35Z juergen $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq -pkgver=1.6.0 -pkgrel=5 +pkgver=1.6.1 +pkgrel=1 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" @@ -12,7 +12,7 @@ depends=('boost-libs' 'gpgme' 'libxss' 'qt') makedepends=('cmake' 'boost') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) -md5sums=('383153697e281a0b1b4ff008936731b8') +md5sums=('9caa6d2e215a41a8b99c64ecbc2e6299') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 1c7f0dafa..cd48ff887 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165449 2012-08-19 19:05:03Z giovanni $ +# $Id: PKGBUILD 165457 2012-08-20 09:26:27Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.08.17 +pkgver=2012.08.20 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -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=('8bb807d9ac435d4030a38466f8236117') +md5sums=('0504355e4bb7fa5e2c02c098eb5421b6') build() { cd ${srcdir}/live diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 6b7d72b86..6a7337f79 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162162 2012-06-22 12:59:21Z dreisner $ +# $Id: PKGBUILD 165490 2012-08-20 19:14:16Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=7 +pkgrel=10 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -26,7 +26,7 @@ sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91' '4537d1f58b299d463db5048129cb264511474b0b' '4f76f7f9ffc8315ff9924f793f272d4f6939b816' - '81df5c4d51cb69bc29363625ff49e2bd388d1fa9') + '25a27cecdb937f48fa7b7c71dcc8b31cdad89306') install=install @@ -61,4 +61,7 @@ package() { install -d "${pkgdir}"/usr/share/man mv man/man* "${pkgdir}"/usr/share/man mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + + install -dm755 "$pkgdir/usr/lib/ntp-units.d" + echo "ntpd.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" } diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service index e0cbf879e..dcb5df634 100644 --- a/extra/ntp/ntpd.service +++ b/extra/ntp/ntpd.service @@ -1,12 +1,12 @@ [Unit] Description=Network Time Service -After=network.target +After=network.target nss-lookup.target [Service] Type=forking -PIDFile=/run/ntpd.pid -EnvironmentFile=/etc/conf.d/ntpd.conf -ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid +PrivateTmp=true +ExecStart=/usr/bin/ntpd -g -u ntp:ntp +ControlGroup=cpu:/ [Install] WantedBy=multi-user.target diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 81feff3fe..512f420d5 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162238 2012-06-24 07:45:21Z giovanni $ +# $Id: PKGBUILD 165459 2012-08-20 09:49:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('943b4ccf1a481600784538148d86d3e4') +md5sums=('55a09aa0a9513c9b8c5ae6e414a3cc8e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index ef2fed15a..d880b3397 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,31 +1,21 @@ -# $Id: PKGBUILD 163234 2012-07-11 16:22:59Z stephane $ +# $Id: PKGBUILD 165493 2012-08-20 23:08:36Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig -pkgver=2.0.7 -pkgrel=2 +pkgver=2.0.8 +pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64' 'mips64el') url="http://www.swig.org/" license=('custom') depends=('zlib' 'pcre') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - pyint_fromsize_t.diff - upstream_r13128.diff) -sha1sums=('307020fb6437092e32c9c1bd9af8bccb1645b529' - '59ee179b57920d255c58afe45632b896e40b5b7d' - '8f0c5ae6a46c22606cc88c649bfd0a31f061a963') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('763305da320163903c69c1cdfbf9a942117d9ace') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # FS#30624 - patch -Np1 -i ../pyint_fromsize_t.diff - - # Fix call to Swig_name_decl - patch -Np1 -i ../upstream_r13128.diff - ./configure --prefix=/usr make } diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 7369bf9c8..2cfd6a06b 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 164034 2012-07-24 18:37:58Z ibiru $ +# $Id: PKGBUILD 165472 2012-08-20 13:29:51Z tomegun $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.61 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz - transmissiond transmissiond.conf) -md5sums=('2ed5b7815ebda65223bac6bdb09dec42' - '08875299e3fbb68fc546c1f350ac1f06' - 'be39806c35b7544856fa4070b00fc960') + transmissiond transmissiond.conf transmission.systemd + transmission.tmpfiles) build() { cd "$pkgbase-$pkgver" @@ -39,6 +37,9 @@ package_transmission-cli() { install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" + install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" + install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" + ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service" install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" } @@ -70,3 +71,8 @@ package_transmission-qt() { install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png" install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop" } +md5sums=('2ed5b7815ebda65223bac6bdb09dec42' + '7d6186ee2a852ae3d44980f05063e194' + 'db72b02fee139e8ab416324e6c044d76' + '5c289c8901221a94be74665368ab5c2c' + '23f2320361ad54373c3a4551ef634fe8') diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index cb6bf6050..68df89498 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -3,7 +3,14 @@ post_install() { If you want to run the Transmission daemon at boot, add transmissiond to the DAEMONS array in /etc/rc.conf. - You have to set the user in /etc/conf.d/transmissiond. _EOF } + +post_upgrade() { + # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files + getent group transmission >/dev/null || groupadd -g 169 transmission + getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission + passwd -l transmission &>/dev/null + systemd-tmpfiles --create transmission.conf +} diff --git a/testing/transmission/transmission.systemd b/extra/transmission/transmission.systemd index 2ca0dedf7..56ab8f794 100644 --- a/testing/transmission/transmission.systemd +++ b/extra/transmission/transmission.systemd @@ -1,6 +1,9 @@ [Unit] Description=Transmission Bit Torrent Daemon +# This assumes that a user 'transmission' exists, with a writeable homedirectory, +# and that /run/transmission exists and is writeable by the transmission user. + [Service] User=transmission Type=forking diff --git a/testing/transmission/transmission.tmpfiles b/extra/transmission/transmission.tmpfiles index b603066c1..b603066c1 100644 --- a/testing/transmission/transmission.tmpfiles +++ b/extra/transmission/transmission.tmpfiles diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond index 1b4b4dc0e..ea3d770f9 100644 --- a/extra/transmission/transmissiond +++ b/extra/transmission/transmissiond @@ -8,7 +8,7 @@ PID=`pidof -o %PPID /usr/bin/transmission-daemon` case "$1" in start) stat_busy "Starting Transmission Daemon" - [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" $TRANS_USER + [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}" if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/transmission/transmissiond.conf b/extra/transmission/transmissiond.conf index cf6c6f26e..45a9fd51d 100644 --- a/extra/transmission/transmissiond.conf +++ b/extra/transmission/transmissiond.conf @@ -1,5 +1,4 @@ # example configuration file -# TRANSMISSION_HOME=/home/foo -# TRANS_USER="foo" -# TRANS_ARGS="-g $TRANSMISSION_HOME/.config/transmission-daemon" +# TRANS_USER="transmission" +# TRANS_ARGS="" diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index a209713b3..0eefec6df 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,13 +5,16 @@ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2012.07.29 +pkgver=2012.08.21 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') url="https://parabolagnulinux.org" license=('GPL2') groups=('base') +provides=('initscripts-systemd') +conflicts=('initscripts-systemd') +replaces=('initscripts-systemd') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit') optdepends=('dhcpcd: DHCP network configuration' @@ -21,10 +24,10 @@ optdepends=('dhcpcd: DHCP network configuration' makedepends=(asciidoc) install=initscripts.install source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig}) +md5sums=('abf911f25417e8fd3c7d787e6f4f1e9e' + '993fd80840cb8d0090e2c93b95a2b71c') package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } -md5sums=('0fc663f1ad8e7512f5907d498e09be21' - '372f08fcb40e31c0e88a9715354e3b19') diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 1d5f60079..597406075 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts') -pkgver=4.1.18 -pkgrel=7 +pkgver=4.1.20 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -20,7 +20,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch) -md5sums=('38db0a87cba659b484af868b0c2bd3ac' +md5sums=('5784c6dda8a9d53f8f21b2d41eba903c' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe' '8538dba8686d7449cb481c9bae9d722a' @@ -45,7 +45,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' 'a9e4724b56ddf99bb2e9a8fab8ad43ba' - 'f7d275fc52e5f3cfafd85646c2914063') + '1e47d90affabfbf6dbb07d9d42742d6a') _extramodules=extramodules-3.0-LIBRE-LTS diff --git a/libre/virtualbox-libre-modules-lts/free-distros.patch b/libre/virtualbox-libre-modules-lts/free-distros.patch index 7920fb6ab..47857e05d 100644 --- a/libre/virtualbox-libre-modules-lts/free-distros.patch +++ b/libre/virtualbox-libre-modules-lts/free-distros.patch @@ -432,8 +432,8 @@ <file alias="hd_16px.png">images/hd_16px.png</file> <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> <file alias="hd_32px.png">images/hd_32px.png</file> ---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/Global.cpp 2012-06-20 10:17:34.000000000 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/src-all/Global.cpp 2012-07-25 19:32:44.482993976 -0300 +--- VirtualBox-4.1.20.orig/src/VBox/Main/src-all/Global.cpp 2012-08-20 11:36:24.000000000 -0300 ++++ VirtualBox-4.1.20/src/VBox/Main/src-all/Global.cpp 2012-08-21 14:22:29.148190849 -0300 @@ -35,284 +35,90 @@ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -655,25 +655,25 @@ - { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros", - VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, - 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", -- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", -- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dynebolic, "Dyne:bolic", + VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", -- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", +- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, +- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Venenux, "Venenux", + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", +- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, +- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", +- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, +- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 7104ed19c..18b529e63 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') -pkgver=4.1.18 -pkgrel=6.2 +pkgver=4.1.20 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -19,7 +19,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch) -md5sums=('38db0a87cba659b484af868b0c2bd3ac' +md5sums=('5784c6dda8a9d53f8f21b2d41eba903c' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe' '8538dba8686d7449cb481c9bae9d722a' @@ -44,7 +44,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' 'a9e4724b56ddf99bb2e9a8fab8ad43ba' - 'f7d275fc52e5f3cfafd85646c2914063') + '1e47d90affabfbf6dbb07d9d42742d6a') _extramodules=extramodules-3.5-LIBRE diff --git a/libre/virtualbox-libre-modules/free-distros.patch b/libre/virtualbox-libre-modules/free-distros.patch index 7920fb6ab..47857e05d 100644 --- a/libre/virtualbox-libre-modules/free-distros.patch +++ b/libre/virtualbox-libre-modules/free-distros.patch @@ -432,8 +432,8 @@ <file alias="hd_16px.png">images/hd_16px.png</file> <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> <file alias="hd_32px.png">images/hd_32px.png</file> ---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/Global.cpp 2012-06-20 10:17:34.000000000 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/src-all/Global.cpp 2012-07-25 19:32:44.482993976 -0300 +--- VirtualBox-4.1.20.orig/src/VBox/Main/src-all/Global.cpp 2012-08-20 11:36:24.000000000 -0300 ++++ VirtualBox-4.1.20/src/VBox/Main/src-all/Global.cpp 2012-08-21 14:22:29.148190849 -0300 @@ -35,284 +35,90 @@ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -655,25 +655,25 @@ - { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros", - VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, - 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", -- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", -- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dynebolic, "Dyne:bolic", + VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", -- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", +- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, +- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Venenux, "Venenux", + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", +- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, +- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", +- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, +- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 8e239915d..eef1c73ca 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -10,8 +10,8 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-source' 'virtualbox-libre-parabola-source') -pkgver=4.1.18 -pkgrel=5.4 +pkgver=4.1.20 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -20,14 +20,13 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor #'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk ipv6_vnc.patch + 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk ipv6_vnc.patch change_default_driver_dir.patch vboxservice.conf vboxservice.rc vboxservice.service - vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png - os_dragora_64.png os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png - os_gnu_64.png os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png - os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png - os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch - free-distros.patch) + vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png os_dragora_64.png + os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png os_gnu_64.png + os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png os_musix_64.png + os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png + os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch) _extramodules=extramodules-3.5-LIBRE _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true @@ -39,8 +38,6 @@ build() { patch -Np1 -i "$srcdir/change_default_driver_dir.patch" patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/free-distros.patch" - # FS#30401 - patch -Np2 -i "$srcdir/ipv6_vnc.patch" ## Removing Nonfree directories rm -rv "./include/VBox/ExtPack" @@ -255,7 +252,7 @@ package_virtualbox-libre-parabola-source() { cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source" } -md5sums=('38db0a87cba659b484af868b0c2bd3ac' +md5sums=('5784c6dda8a9d53f8f21b2d41eba903c' '5f85710e0b8606de967716ded7b2d351' 'bf5d1eeeec20a042e8af34cd61a9e11b' 'a1ff1d1b4423556887e48a32978226a6' @@ -289,4 +286,4 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' 'a9e4724b56ddf99bb2e9a8fab8ad43ba' - 'f7d275fc52e5f3cfafd85646c2914063') + '1e47d90affabfbf6dbb07d9d42742d6a') diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 7920fb6ab..47857e05d 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -432,8 +432,8 @@ <file alias="hd_16px.png">images/hd_16px.png</file> <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> <file alias="hd_32px.png">images/hd_32px.png</file> ---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/Global.cpp 2012-06-20 10:17:34.000000000 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/src-all/Global.cpp 2012-07-25 19:32:44.482993976 -0300 +--- VirtualBox-4.1.20.orig/src/VBox/Main/src-all/Global.cpp 2012-08-20 11:36:24.000000000 -0300 ++++ VirtualBox-4.1.20/src/VBox/Main/src-all/Global.cpp 2012-08-21 14:22:29.148190849 -0300 @@ -35,284 +35,90 @@ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -655,25 +655,25 @@ - { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros", - VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, - 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", -- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", -- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dynebolic, "Dyne:bolic", + VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", -- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", +- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, +- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Venenux, "Venenux", + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", +- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, +- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", +- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, +- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, diff --git a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by <fabbe@debian.org> - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/testing/cyrus-sasl/0010_maintainer_mode.patch b/testing/cyrus-sasl/0010_maintainer_mode.patch deleted file mode 100644 index cf3d02a08..000000000 --- a/testing/cyrus-sasl/0010_maintainer_mode.patch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 0010_maintainer_mode.dpatch by <fabbe@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Enable maintainer mode to avoid auto* problems. - -@DPATCH@ -diff -urNad trunk~/configure.in trunk/configure.in ---- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 -+++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 -@@ -62,6 +62,8 @@ - AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) - CMU_INIT_AUTOMAKE - -+AM_MAINTAINER_MODE -+ - # and include our config dir scripts - ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" - diff --git a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch deleted file mode 100644 index 3805b4857..000000000 --- a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch +++ /dev/null @@ -1,15 +0,0 @@ -0011_saslauthd_ac_prog_libtool.dpatch by <fabbe@debian.org> - -Enable libtool use. - -diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in ---- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 -@@ -25,6 +25,7 @@ - AC_PROG_MAKE_SET - AC_PROG_LN_S - AC_PROG_INSTALL -+AC_PROG_LIBTOOL - - dnl Checks for build foo - CMU_C___ATTRIBUTE__ diff --git a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by <dannf@debian.org> - -When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h> -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org> - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by <fabbe@debian.org> - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/testing/cyrus-sasl/0019_ldap_deprecated.patch b/testing/cyrus-sasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/testing/cyrus-sasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier <dannf@debian.org> - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm <fabbe@debian.org>) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include <openssl/des.h> - #endif - -+#define LDAP_DEPRECATED 1 - #include <ldap.h> - #include <lber.h> - #include <sasl.h> diff --git a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by <fabbe@paniq.net> - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/testing/cyrus-sasl/0025_ld_as_needed.patch b/testing/cyrus-sasl/0025_ld_as_needed.patch deleted file mode 100644 index 67b48b4a4..000000000 --- a/testing/cyrus-sasl/0025_ld_as_needed.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Matthias Klose <doko@ubuntu.com> -Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use -it. ---- a/saslauthd/Makefile.am -+++ b/saslauthd/Makefile.am -@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c - saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ - saslauthd_LDADD = @SASL_KRB_LIB@ \ - @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ -- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ -+ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ - - testsaslauthd_SOURCES = testsaslauthd.c utils.c - testsaslauthd_LDADD = @LIB_SOCKET@ ---- a/sasldb/Makefile.am -+++ b/sasldb/Makefile.am -@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a - - libsasldb_la_SOURCES = allockey.c sasldb.h - EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) --libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) --libsasldb_la_LIBADD = $(SASL_DB_BACKEND) -+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) -+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) - - # Prevent make dist stupidity - libsasldb_a_SOURCES = diff --git a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch deleted file mode 100644 index cc00867ef..000000000 --- a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Roberto C. Sanchez <roberto@connexer.com> -Description: Drop gratuitous dependency on krb5support ---- a/cmulocal/sasl2.m4 -+++ b/cmulocal/sasl2.m4 -@@ -112,9 +112,6 @@ if test "$gssapi" != no; then - fi - - if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then -- # check for libkrb5support first -- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) -- - gss_failed=0 - AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, - ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/testing/cyrus-sasl/0027_db5_support.patch b/testing/cyrus-sasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/testing/cyrus-sasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý <ondrej@debian.org> -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch deleted file mode 100644 index 14a322496..000000000 --- a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch +++ /dev/null @@ -1,134 +0,0 @@ ---- a/lib/dlopen.c -+++ b/lib/dlopen.c -@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi - return result; - } - --/* this returns the file to actually open. -- * out should be a buffer of size PATH_MAX -- * and may be the same as in. */ -- --/* We'll use a static buffer for speed unless someone complains */ --#define MAX_LINE 2048 -- --static int _parse_la(const char *prefix, const char *in, char *out) --{ -- FILE *file; -- size_t length; -- char line[MAX_LINE]; -- char *ntmp = NULL; -- -- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; -- -- /* Set this so we can detect failure */ -- *out = '\0'; -- -- length = strlen(in); -- -- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { -- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { -- /* check for a .la file */ -- strcpy(line, prefix); -- strcat(line, in); -- length = strlen(line); -- *(line + (length - strlen(SO_SUFFIX))) = '\0'; -- strcat(line, LA_SUFFIX); -- file = fopen(line, "r"); -- if(file) { -- /* We'll get it on the .la open */ -- fclose(file); -- return SASL_FAIL; -- } -- } -- strcpy(out, prefix); -- strcat(out, in); -- return SASL_OK; -- } -- -- strcpy(line, prefix); -- strcat(line, in); -- -- file = fopen(line, "r"); -- if(!file) { -- _sasl_log(NULL, SASL_LOG_WARN, -- "unable to open LA file: %s", line); -- return SASL_FAIL; -- } -- -- while(!feof(file)) { -- if(!fgets(line, MAX_LINE, file)) break; -- if(line[strlen(line) - 1] != '\n') { -- _sasl_log(NULL, SASL_LOG_WARN, -- "LA file has too long of a line: %s", in); -- return SASL_BUFOVER; -- } -- if(line[0] == '\n' || line[0] == '#') continue; -- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { -- /* We found the line with the name in it */ -- char *end; -- char *start; -- size_t len; -- end = strrchr(line, '\''); -- if(!end) continue; -- start = &line[sizeof("dlname=")-1]; -- len = strlen(start); -- if(len > 3 && start[0] == '\'') { -- ntmp=&start[1]; -- *end='\0'; -- /* Do we have dlname="" ? */ -- if(ntmp == end) { -- _sasl_log(NULL, SASL_LOG_DEBUG, -- "dlname is empty in .la file: %s", in); -- return SASL_FAIL; -- } -- strcpy(out, prefix); -- strcat(out, ntmp); -- } -- break; -- } -- } -- if(ferror(file) || feof(file)) { -- _sasl_log(NULL, SASL_LOG_WARN, -- "Error reading .la: %s\n", in); -- fclose(file); -- return SASL_FAIL; -- } -- fclose(file); -- -- if(!(*out)) { -- _sasl_log(NULL, SASL_LOG_WARN, -- "Could not find a dlname line in .la file: %s", in); -- return SASL_FAIL; -- } -- -- return SASL_OK; --} - #endif /* DO_DLOPEN */ - - /* loads a plugin library */ -@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ - if (length + pos>=PATH_MAX) continue; /* too big */ - - if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), -- SO_SUFFIX) -- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), -- LA_SUFFIX)) -+ SO_SUFFIX)) - continue; - -+ /* We only use .so files for loading plugins */ -+ - memcpy(name,dir->d_name,length); - name[length]='\0'; - -- result = _parse_la(prefix, name, tmp); -- if(result != SASL_OK) -- continue; -- -+ /* Create full name with path */ -+ strncpy(tmp, prefix, PATH_MAX); -+ strncat(tmp, name, PATH_MAX); -+ - /* skip "lib" and cut off suffix -- - this only need be approximate */ - strcpy(plugname, name + 3); diff --git a/testing/cyrus-sasl/PKGBUILD b/testing/cyrus-sasl/PKGBUILD deleted file mode 100644 index b6c2a29bc..000000000 --- a/testing/cyrus-sasl/PKGBUILD +++ /dev/null @@ -1,203 +0,0 @@ -# $Id: PKGBUILD 165399 2012-08-17 23:39:59Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -# This package spans multiple repositories. -# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. - -pkgbase=('cyrus-sasl') -pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') -#pkgname=libsasl -pkgver=2.1.23 -pkgrel=10 -pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" -arch=('i686' 'x86_64') -url="http://cyrusimap.web.cmu.edu/" -license=('custom') -options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch - cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch - 0010_maintainer_mode.patch - 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch - 0025_ld_as_needed.patch - 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch - 0030-dont_use_la_files_for_opening_plugins.patch - saslauthd.service - saslauthd.conf.d - saslauthd) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' - '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' - 'f45d8b60e8f74dd7f7c2ec1665fa602a' - '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' - '62bf892fe4d1df41ff748e91a1afaf67' - 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' - '8e7106f32e495e9ade69014fd1b3352a' - '00f6b781549a274630e22173f77bd41d' - '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20') - -build() { - cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" - patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" - patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" - patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" - patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" - patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" - - rm -f config/config.guess config/config.sub - rm -f config/ltconfig config/ltmain.sh config/libtool.m4 - rm -fr autom4te.cache - libtoolize -c - aclocal -I config -I cmulocal - automake -a -c - autoheader - autoconf - - pushd saslauthd - rm -f config/config.guess config/config.sub - rm -f config/ltconfig config/ltmain.sh config/libtool.m4 - rm -fr autom4te.cache - libtoolize -c - aclocal -I config -I ../cmulocal -I ../config - automake -a -c - autoheader - autoconf - popd - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-static \ - --enable-shared \ - --enable-alwaystrue \ - --enable-checkapop \ - --enable-cram \ - --enable-digest \ - --disable-otp \ - --disable-srp \ - --disable-srp-setpass \ - --disable-krb4 \ - --enable-gssapi \ - --enable-auth-sasldb \ - --enable-plain \ - --enable-anon \ - --enable-login \ - --enable-ntlm \ - --disable-passdss \ - --enable-sql \ - --enable-ldapdb \ - --disable-macos-framework \ - --with-pam \ - --with-saslauthd=/var/run/saslauthd \ - --with-ldap \ - --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ - --sysconfdir=/etc \ - --with-devrandom=/dev/urandom - make -} - -package_libsasl() { - pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" - depends=('openssl') - conflicts=('cyrus-sasl-plugins') - - cd "${srcdir}/cyrus-sasl-${pkgver}" - for dir in include lib sasldb plugins utils; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* - install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" - install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" -} - -package_cyrus-sasl() { - depends=("libsasl=${pkgver}") - pkgdesc="Cyrus saslauthd SASL authentication daemon" - backup=('etc/conf.d/saslauthd') - - cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" - make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" - install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" - install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" -} - -package_cyrus-sasl-gssapi() { - pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}" 'krb5') - replaces=('cyrus-sasl-plugins') - - cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" -} - -package_cyrus-sasl-ldap() { - pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'libldap') - replaces=('cyrus-sasl-plugins') - - cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" -} - -package_cyrus-sasl-sql() { - pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmysqlclient') - replaces=('cyrus-sasl-plugins') - - cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" -} diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch deleted file mode 100644 index 1294cb507..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 -+++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 -@@ -77,7 +77,7 @@ - AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) - SASL_DB_PATH_CHECK() - SASL_DB_CHECK() -- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" -+ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" - fi - - AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch deleted file mode 100644 index 4f7b04f13..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch +++ /dev/null @@ -1,22 +0,0 @@ -fix missing prototype warnings - ---- cyrus-sasl-2.1.22/lib/auxprop.c -+++ cyrus-sasl-2.1.22/lib/auxprop.c -@@ -43,6 +43,7 @@ - */ - - #include <config.h> -+#include <stdio.h> - #include <sasl.h> - #include <prop.h> - #include <ctype.h> ---- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c -+++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c -@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF - ******************************************************************/ - - #include <shadow.h> -+#include <string.h> - - extern char *crypt(); - diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include <string.h> - #include <stdlib.h> - #include <pwd.h> -+#include <unistd.h> - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/testing/cyrus-sasl/saslauthd b/testing/cyrus-sasl/saslauthd deleted file mode 100644 index 6afafae0b..000000000 --- a/testing/cyrus-sasl/saslauthd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_RUN=/var/run/saslauthd -SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd - if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then - add_daemon $DAEMON_NAME - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon $DAEMON_NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/cyrus-sasl/saslauthd.conf.d b/testing/cyrus-sasl/saslauthd.conf.d deleted file mode 100644 index 167211290..000000000 --- a/testing/cyrus-sasl/saslauthd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SASLAUTHD_OPTS="-a pam" diff --git a/testing/cyrus-sasl/saslauthd.service b/testing/cyrus-sasl/saslauthd.service deleted file mode 100644 index 42d8ad768..000000000 --- a/testing/cyrus-sasl/saslauthd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Cyrus SASL authentication daemon - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/saslauthd -ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS -PidFile=/var/run/saslauthd/saslauthd.pid - -[Install] -WantedBy=multi-user.target diff --git a/testing/dhcp/dhcpd4.service b/testing/dhcp/dhcpd4.service deleted file mode 100644 index 2ef4a9f26..000000000 --- a/testing/dhcp/dhcpd4.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=IPv4 DHCP server -After=network.target - -[Service] -Type=forking -PIDFile=/run/dhcpd4.pid -ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid -ExecReload=/bin/kill -TERM $MAINPID -KillSignal=SIGINT - -[Install] -WantedBy=multi-user.target diff --git a/testing/dhcp/dhcpd6.service b/testing/dhcp/dhcpd6.service deleted file mode 100644 index eb3b337c6..000000000 --- a/testing/dhcp/dhcpd6.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=IPv6 DHCP server -After=network.target - -[Service] -Type=forking -PIDFile=/run/dhcpd6.pid -ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid -ExecReload=/bin/kill -TERM $MAINPID -KillSignal=SIGINT - -[Install] -WantedBy=multi-user.target diff --git a/testing/gdk-pixbuf2/PKGBUILD b/testing/gdk-pixbuf2/PKGBUILD deleted file mode 100644 index 15840ad30..000000000 --- a/testing/gdk-pixbuf2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 165188 2012-08-12 19:25:57Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gdk-pixbuf2 -pkgver=2.26.2 -pkgrel=1 -pkgdesc="An image loading library" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') -makedepends=('gtk-doc' 'gobject-introspection') -options=('!libtool') -install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('3555521050e30e2fa090bfe650910c14649b6ab0acb35a5a7eaf90fe694f1403') - -build() { - cd gdk-pixbuf-$pkgver - - ./configure --prefix=/usr \ - --without-libjasper \ - --with-x11 \ - --with-included-loaders=png - make -} - -package() { - cd gdk-pixbuf-$pkgver - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/gdk-pixbuf2/gdk-pixbuf2.install b/testing/gdk-pixbuf2/gdk-pixbuf2.install deleted file mode 100644 index f04c0967a..000000000 --- a/testing/gdk-pixbuf2/gdk-pixbuf2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache -} diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD deleted file mode 100644 index 71b0db89f..000000000 --- a/testing/gdm/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 165393 2012-08-17 23:22:35Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gdm -pkgver=3.4.1 -pkgrel=3 -pkgdesc="Gnome Display Manager (a reimplementation of xdm)" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org" -backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password' - 'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf') -groups=('gnome-extra') -options=('!libtool') -depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') -makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') -optdepends=('gnome-shell: new login interface' - 'fprintd: fingerprint authentication') -install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - fix_external_program_directories.patch - gdm-vt-allocation-hack.patch - gdm gdm.service - gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) -sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665' - 'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6' - '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' - '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - 'b7b91c682ff4c7cfb2d395c65abeca9dad8c0997b399dcf22abdf481c3e61349' - '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2' - 'dd50f5bd28807a16c5ebe89fc868b7c47fa571138498e879f2b1c9da1ad6eb84' - 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '1a1e9b3f26de4eb9f45d1e9a0b5d0db902ca734461ba46b4bb620b0298bb98aa' - '844d5fae0df59241d34099a3d458289bd95707b2aae976627c663904294043d8' - '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') - -build() { - cd "$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix_external_program_directories.patch" - patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gdm \ - --localstatedir=/var \ - --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ - --disable-scrollkeeper \ - --disable-static \ - --without-tcp-wrappers \ - --disable-schemas-compile \ - --with-systemd=no - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do - install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}" - done - - install -Dm755 "$srcdir/gdm" "$pkgdir/etc/rc.d/gdm" - install -Dm644 "$srcdir/gdm.service" "$pkgdir/usr/lib/systemd/system/gdm.service" - - chmod 1770 "$pkgdir/var/log/gdm" - chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" - rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm" -} diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch deleted file mode 100644 index b3a0f0cf6..000000000 --- a/testing/gdm/fix_external_program_directories.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c ---- gdm-3.3.92.orig/daemon/gdm-server.c 2012-03-19 22:30:05.311490006 +0000 -+++ gdm-3.3.92/daemon/gdm-server.c 2012-03-19 22:30:17.004732251 +0000 -@@ -139,7 +139,7 @@ - g_return_val_if_fail (GDM_IS_SERVER (server), NULL); - - error = NULL; -- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", -+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", - server->priv->display_name); - - g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in ---- gdm-3.3.92.orig/data/gdm-shell.session.in 2012-03-19 22:30:05.311490006 +0000 -+++ gdm-3.3.92/data/gdm-shell.session.in 2012-03-19 22:30:17.004732251 +0000 -@@ -1,5 +1,5 @@ - [GNOME Session] - Name=Display Manager - RequiredComponents=gnome-shell;gnome-settings-daemon; --IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' -+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated' - FallbackSession=gdm-fallback -diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c ---- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:05.304823391 +0000 -+++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:17.004732251 +0000 -@@ -131,7 +131,7 @@ - ret = FALSE; - - error = NULL; -- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); -+ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error); - if (error != NULL) { - g_warning ("Error starting settings daemon: %s", error->message); - g_error_free (error); diff --git a/testing/gdm/gdm b/testing/gdm/gdm deleted file mode 100755 index c3e635a6d..000000000 --- a/testing/gdm/gdm +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting GDM" - /usr/sbin/gdm & - if [ $? -gt 0 ]; then - stat_fail - else - - add_daemon gdm - stat_done - fi - ;; - stop) - stat_busy "Stopping GDM" - [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gdm - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam deleted file mode 100644 index bc0193df0..000000000 --- a/testing/gdm/gdm-autologin.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_permit.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam deleted file mode 100644 index 38fab5782..000000000 --- a/testing/gdm/gdm-fingerprint.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_fprintd.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam deleted file mode 100644 index eed5e1003..000000000 --- a/testing/gdm/gdm-password.pam +++ /dev/null @@ -1,22 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_unix.so nullok -auth optional pam_gnome_keyring.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_unix.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam deleted file mode 100644 index c5c29e73f..000000000 --- a/testing/gdm/gdm-smartcard.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_pkcs11.so wait_for_card card_only - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_pkcs11.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch deleted file mode 100644 index 56fa5a151..000000000 --- a/testing/gdm/gdm-vt-allocation-hack.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 39def47..03488fd 100644 ---- a/daemon/gdm-server.c -+++ b/daemon/gdm-server.c -@@ -33,6 +33,8 @@ - #include <grp.h> - #include <signal.h> - #include <sys/resource.h> -+#include <sys/ioctl.h> -+#include <sys/vt.h> - - #include <glib.h> - #include <glib/gi18n.h> -@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) - return out; - } - -+#ifndef O_NOCTTY -+# define O_NOCTTY 0 -+#endif -+ -+static int -+open_vt (int vtno) -+{ -+ char *vtname; -+ int fd; -+ -+ vtname = g_strdup_printf ("/dev/tty%d", vtno); -+ -+ do { -+ errno = 0; -+ fd = open (vtname, O_RDWR | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ g_free (vtname); -+ return fd; -+} -+ -+static gint -+find_first_probably_free_vt (void) -+{ -+ int fd, fdv; -+ int vtno; -+ unsigned short vtmask; -+ struct vt_stat vtstat; -+ guint v_state; -+ -+ fdv = -1; -+ -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { -+ v_state = vtstat.v_state; -+ } else { -+ close (fd); -+ v_state = 0; -+ fd = -1; -+ } -+ } else { -+ v_state = 0; -+ } -+ -+ if (fd < 0) { -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) -+ v_state = vtstat.v_state; -+ } -+ } -+ -+ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { -+ /* Is this console in use? */ -+ if (v_state & vtmask) -+ continue; -+ -+ /* No, try to open it */ -+ fdv = open_vt (vtno); -+ if (fdv >= 0) -+ break; -+ -+ /* If we're here, kernel indicated that the console was free, -+ * but we failed to open it. Just go on to higher VTs. */ -+ } -+ -+ if (fdv >= 0) -+ close (fdv); -+ else -+ vtno = -1; -+ -+ if (fd >= 0) -+ close (fd); -+ -+ return vtno; -+} -+ - char * - gdm_server_get_display_device (GdmServer *server) - { -@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, - - if (vtarg != NULL && ! gotvtarg) { - argv[len++] = g_strdup (vtarg); -+ } else if (!query_in_arglist && !gotvtarg) { -+ gint vtnum = find_first_probably_free_vt (); -+ -+ if (vtnum > 0) -+ argv [len++] = g_strdup_printf ("vt%d", vtnum); - } - - argv[len++] = NULL; diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam deleted file mode 100644 index cc3811c19..000000000 --- a/testing/gdm/gdm-welcome.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so - -account required pam_nologin.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install deleted file mode 100644 index c48faf4ae..000000000 --- a/testing/gdm/gdm.install +++ /dev/null @@ -1,30 +0,0 @@ -pkgname=gdm - -post_install() { - getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm - getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm - passwd -l gdm > /dev/null - chown -R gdm:gdm /var/lib/gdm > /dev/null - - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - dconf update -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then - gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas - dconf update - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - getent passwd gdm >/dev/null 2>&1 && userdel gdm - getent group gdm >/dev/null 2>&1 && groupdel gdm -} diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam deleted file mode 100644 index 655299cb7..000000000 --- a/testing/gdm/gdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -auth optional pam_gnome_keyring.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -password required pam_unix.so diff --git a/testing/gdm/gdm.service b/testing/gdm/gdm.service deleted file mode 100644 index 0125934d6..000000000 --- a/testing/gdm/gdm.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Gnome Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/gdm -nodaemon -Restart=always - -[Install] -Alias=display-manager.service diff --git a/testing/git/ChangeLog b/testing/git/ChangeLog deleted file mode 100644 index f0c15233e..000000000 --- a/testing/git/ChangeLog +++ /dev/null @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee <dan@archlinux.org> - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee <dan@archlinux.org> - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee <dan@archlinux.org> - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee <dan@archlinux.org> - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae <allan@archlinux.org> - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee <dan@archlinux.org> - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee <dan@archlinux.org> - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee <dan@archlinux.org> - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee <dan@archlinux.org> - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee <dan@archlinux.org> - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche <kevin@archlinux.org> - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger <eric@archlinux.org> - Version 1.5.3.5-2 - * Fix Perl module location diff --git a/testing/git/PKGBUILD b/testing/git/PKGBUILD deleted file mode 100644 index bc0f8c8df..000000000 --- a/testing/git/PKGBUILD +++ /dev/null @@ -1,115 +0,0 @@ -# $Id: PKGBUILD 165368 2012-08-16 14:45:26Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=git -pkgver=1.7.11.5 -pkgrel=2 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') -optdepends=('tk: gitk and git gui' - 'perl-libwww: git svn' - 'perl-term-readkey: git svn' - 'perl-mime-tools: git send-email' - 'perl-net-smtp-ssl: git send-email TLS support' - 'perl-authen-sasl: git send-email TLS support' - 'python2: various helper scripts' - 'subversion: git svn' - 'cvsps: git cvsimport') -replaces=('git-core') -provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') -install=git.install -source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" - "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" - git-daemon - git-daemon.conf - git-daemon@.service - git-daemon.socket) -changelog=ChangeLog - -build() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - all - - cd contrib/emacs - make prefix=/usr -} - -check() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - local jobs - jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - NO_SVN_TESTS=y \ - DEFAULT_TEST_TARGET=prove \ - GIT_PROVE_OPTS="$jobs -Q" \ - GIT_TEST_OPTS="--root=/dev/shm/" \ - test -} - -package() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install - - # bash completion - # until this is fixed, no point in loading it dynamically: - # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html - #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git - mkdir -p "$pkgdir"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git - # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ - # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ - $(find "$pkgdir" -name '*.py') \ - "$pkgdir"/usr/lib/git-core/git-p4 \ - "$pkgdir"/usr/share/git/gitview/gitview - - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install - - # how 'bout some manpages? - for mansect in man1 man5 man7; do - for manpage in "$srcdir"/$mansect/*; do - install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) - done - done - - # remove perllocal.pod, .packlist, and empty directories. - rm -rf "$pkgdir"/usr/lib/perl5 - - # git daemon script - install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon - install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf - - # systemd stuff - install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service - install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket -} - -md5sums=('9985d35c11531d546426ebefb327c847' - 'f08a5a60e57f00399bbd384cfd7791f3' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78' - '198ef9d9e79bd8d5868f95ed9f79cc34' - '779c00deb490291c6b477b8cc0161123') diff --git a/testing/git/git-daemon b/testing/git/git-daemon deleted file mode 100644 index 21ba73ed5..000000000 --- a/testing/git/git-daemon +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/lib/git-core/git-daemon" -daemon_name=$(basename $daemon_bin) -PIDF="/var/run/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > $PIDF - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/testing/git/git-daemon.conf b/testing/git/git-daemon.conf deleted file mode 100644 index 3f9a12060..000000000 --- a/testing/git/git-daemon.conf +++ /dev/null @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" diff --git a/testing/git/git-daemon.socket b/testing/git/git-daemon.socket deleted file mode 100644 index c84740588..000000000 --- a/testing/git/git-daemon.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Git Daemon Socket -After=network.target - -[Socket] -ListenStream=9418 -Accept=true - -[Install] -WantedBy=sockets.target diff --git a/testing/git/git-daemon@.service b/testing/git/git-daemon@.service deleted file mode 100644 index 67d4cfa9c..000000000 --- a/testing/git/git-daemon@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Git Daemon Instance -After=network.target - -[Service] -User=git -# The '-' is to ignore non-zero exit statuses -ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git -StandardInput=socket -StandardOutput=inherit -StandardError=journal diff --git a/testing/git/git.install b/testing/git/git.install deleted file mode 100644 index 9edc065ba..000000000 --- a/testing/git/git.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - if ! getent group git >/dev/null; then - groupadd --system git - fi - if ! getent passwd git >/dev/null; then - useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git - passwd -l git >/dev/null - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - if getent passwd git >/dev/null; then - userdel git - fi - if getent group git >/dev/null; then - groupdel git - fi -} diff --git a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch b/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch deleted file mode 100644 index 822b57294..000000000 --- a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c -index 06d951a..2103b10 100644 ---- a/sunrpc/rpc_main.c -+++ b/sunrpc/rpc_main.c -@@ -75,12 +75,9 @@ struct commandline - - static const char *cmdname; - --#define SVR4_CPP "/usr/ccs/lib/cpp" --#define SUNOS_CPP "/lib/cpp" -- - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; -+static const char *CPP = "/lib/cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -327,23 +324,17 @@ find_cpp (void) - { - struct stat buf; - -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } -+ if (stat (CPP, &buf) == 0) -+ return; -+ -+ if (cppDefined) /* user specified cpp but it does not exist */ -+ { -+ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); -+ crash (); - } -+ -+ /* fall back to system CPP */ -+ CPP = "cpp"; - } - - /* -@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -- perror ("execv"); -+ execvp (arglist[0], (char **) arglist); -+ if (errno == ENOENT) -+ { -+ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); -+ exit (1); -+ } -+ perror ("execvp"); - exit (1); - case -1: - perror ("fork"); diff --git a/testing/gnucash/PKGBUILD b/testing/gnucash/PKGBUILD deleted file mode 100644 index 23745c948..000000000 --- a/testing/gnucash/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 165082 2012-08-10 05:02:38Z eric $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Mark Schneider <queueRAM@gmail.com> - -pkgname=gnucash -pkgver=2.4.11 -pkgrel=1 -pkgdesc="A personal and small-business financial-accounting application" -arch=('i686' 'x86_64') -url="http://www.gnucash.org" -license=("GPL") -depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') -makedepends=('intltool') -optdepends=('evince: for print preview' - 'perl-finance-quote: for stock information lookups' - 'perl-date-manip: for stock information lookups') -options=('!libtool' '!makeflags' '!emptydirs') -install=gnucash.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \ - --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - cd src/doc/design - make DESTDIR="${pkgdir}" install-info - - install -dm755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnucash "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnucash/gnucash.install b/testing/gnucash/gnucash.install deleted file mode 100644 index d6a48c31b..000000000 --- a/testing/gnucash/gnucash.install +++ /dev/null @@ -1,34 +0,0 @@ -pkgname=gnucash -info_dir=usr/share/info -info_files=(gnucash-design.info) - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD deleted file mode 100644 index e6517853f..000000000 --- a/testing/gnutls/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 165411 2012-08-18 10:15:13Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnutls -pkgver=3.1.0 -pkgrel=1 -pkgdesc="A library which provides a secure layer over a reliable transport layer" -arch=('i686' 'x86_64') -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" -install=gnutls.install -options=('!libtool' '!zipman') -depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') -makedepends=('valgrind' 'strace') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('db88d8fc44e44be4a0a14b24aa204bbf' - 'c3fa5f3bda5ebe7f37cc997717bb8476') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-zlib \ - --disable-static \ - --disable-guile \ - --disable-valgrind-tests - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -k check # passes all || /bin/true -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman - # gzip -9 all files in infodir and manpages manually - find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; - find "$pkgdir/usr/share/man" -exec gzip -9 {} \; -} diff --git a/testing/gnutls/gnutls.install b/testing/gnutls/gnutls.install deleted file mode 100644 index e8c8e1798..000000000 --- a/testing/gnutls/gnutls.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD deleted file mode 100644 index 88f001a8a..000000000 --- a/testing/inetutils/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 165418 2012-08-18 22:30:35Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=inetutils -pkgver=1.9.1 -pkgrel=3 -pkgdesc="A collection of common network programs" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/inetutils/" -license=('GPL3') -groups=('base') -depends=('readline' 'ncurses' 'pam') -backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ - 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') -options=('!emptydirs') -install=inetutils.install -source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ - ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ - ftpd.service dnsdomainname) -sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' - 'ff0aad9946a38915580b094dadf67e790e8a2f87' - '84dc802b5e57b5e04c847572225a3b9612017155' - '68a590083b45997dfdb80e666b2de762f494ba74' - 'bfad98a4a62f1fff8779f076c6019ed07f9111af' - '27d99b910eec0fc26bd79ccc2c1de26608330298' - '81f10b3b688e3952f793b35bcef63b5bf257a92b' - '81f4a8da823cf0bb14284fc71ee6108849691eda' - '1c5ff1b6166c7401ef0956ce6eab30450ff95eaf' - 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h - ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ - --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ - --without-wrap --with-pam \ - --enable-ftp --enable-ftpd \ - --enable-telnet --enable-telnetd \ - --enable-talk --enable-talkd \ - --enable-rlogin --enable-rlogind \ - --enable-rsh --enable-rshd \ - --enable-rcp --enable-hostname \ - --disable-rexec --disable-rexecd \ - --disable-tftp --disable-tftpd \ - --disable-ping --disable-ping6 \ - --disable-logger --disable-syslogd \ - --disable-inetd --disable-whois \ - --disable-uucpd --disable-ifconfig --disable-traceroute - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/bin" - ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" - install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" - echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" - install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" - install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" - install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" - install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" - install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" - install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" - install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service" -} diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname deleted file mode 100644 index a1b8a8c31..000000000 --- a/testing/inetutils/dnsdomainname +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/hostname -d "$@" diff --git a/testing/inetutils/ftpd.conf b/testing/inetutils/ftpd.conf deleted file mode 100644 index f660f0035..000000000 --- a/testing/inetutils/ftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ftpd -# -FTPD_ARGS="" diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc deleted file mode 100644 index 3d0d34421..000000000 --- a/testing/inetutils/ftpd.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ftpd - -PID=$(pidof -o %PPID /usr/sbin/ftpd) -case "$1" in - start) - stat_busy "Starting ftpd" - [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ftpd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/inetutils/ftpd.service b/testing/inetutils/ftpd.service deleted file mode 100644 index 985eb9756..000000000 --- a/testing/inetutils/ftpd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=FTPD Daemon - -[Service] -ExecStart=/usr/sbin/ftpd -D -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/testing/inetutils/inetutils.install b/testing/inetutils/inetutils.install deleted file mode 100644 index b338fa498..000000000 --- a/testing/inetutils/inetutils.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(inetutils.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/testing/inetutils/rlogin.xinetd b/testing/inetutils/rlogin.xinetd deleted file mode 100644 index 5c72f86df..000000000 --- a/testing/inetutils/rlogin.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service login -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/rlogind - log_on_failure += USERID - disable = yes -} diff --git a/testing/inetutils/rsh.xinetd b/testing/inetutils/rsh.xinetd deleted file mode 100644 index a13738c31..000000000 --- a/testing/inetutils/rsh.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service shell -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/rshd - log_on_failure += USERID - disable = yes -} diff --git a/testing/inetutils/talk.xinetd b/testing/inetutils/talk.xinetd deleted file mode 100644 index 6abef359c..000000000 --- a/testing/inetutils/talk.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service ntalk -{ - flags = REUSE - socket_type = dgram - wait = yes - user = root - server = /usr/sbin/talkd - log_on_failure += USERID - disable = yes -} diff --git a/testing/inetutils/telnet.xinetd b/testing/inetutils/telnet.xinetd deleted file mode 100644 index bd3a5e4b1..000000000 --- a/testing/inetutils/telnet.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service telnet -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/telnetd - log_on_failure += USERID - disable = yes -} diff --git a/testing/irqbalance/PKGBUILD b/testing/irqbalance/PKGBUILD deleted file mode 100644 index 52c5ae477..000000000 --- a/testing/irqbalance/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Dan McGee <dan@archlinux.org> -# Contributor: Martin Striz <ms@poruba.net> - -pkgname=irqbalance -_realver=1.0.3 -pkgver=1.0.3.20110809 -pkgrel=1 -pkgdesc="IRQ balancing daemon for SMP systems" -arch=('i686' 'x86_64') -url="http://code.google.com/p/irqbalance" -license=('GPL') -depends=(glib2 numactl libcap-ng) -makedepends=(pkgconfig) -backup=(etc/conf.d/irqbalance) -source=(http://irqbalance.googlecode.com/files/irqbalance-$_realver.tar.gz - irqbalance-2011-08-09.patch - irqbalance.conf.d - irqbalance.rc.d - irqbalance.service) -md5sums=('6f246481d6295bcb9a79751c03207c96' - '49a5669fc3eb452a5d24abec887f0a6a' - '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c' - '9e82dc471128117982a8dd0c4bd5f246') - -build() { - cd "$srcdir/$pkgname-$_realver" - patch -Np1 < ../irqbalance-2011-08-09.patch - autoreconf -fi - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$_realver" - make install DESTDIR="$pkgdir" - install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance - install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance - install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service -} diff --git a/testing/irqbalance/irqbalance.conf.d b/testing/irqbalance/irqbalance.conf.d deleted file mode 100644 index ef1bdfd75..000000000 --- a/testing/irqbalance/irqbalance.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Settings for irqbalance daemon -# - -# one shot mode - set to 1 if you have Pentium 4 with HT -ONESHOT=0 diff --git a/testing/irqbalance/irqbalance.rc.d b/testing/irqbalance/irqbalance.rc.d deleted file mode 100644 index 987c26b51..000000000 --- a/testing/irqbalance/irqbalance.rc.d +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# source application-specific settings -ONESHOT=0 -[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance - -if [ "$ONESHOT" -ne 0 ]; then - ONESHOT_CMD="--oneshot" -fi - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` -case "$1" in - start) - stat_busy "Starting IRQ balancing" - [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD - if [ $? -gt 0 ]; then - stat_fail - else - if [ "$ONESHOT" -eq 0 ]; then - add_daemon irqbalance - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping IRQ balancing" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irqbalance - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/libcap-ng/PKGBUILD b/testing/libcap-ng/PKGBUILD deleted file mode 100644 index e67e9ee4a..000000000 --- a/testing/libcap-ng/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 165202 2012-08-12 20:44:32Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=libcap-ng -pkgver=0.7 -pkgrel=1 -pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap" -arch=('i686' 'x86_64') -url="http://people.redhat.com/sgrubb/libcap-ng/" -license=('GPL2' 'LGPL2.1') -depends=('glibc') -options=('!libtool') -source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('85c14a2442a3721383a1e2284e254846') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --enable-static=no --with-python=no - make -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR=$pkgdir install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD deleted file mode 100644 index 0c358f943..000000000 --- a/testing/libmpc/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 165240 2012-08-14 08:30:00Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=libmpc -pkgver=1.0 -pkgrel=1 -pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" -arch=('i686' 'x86_64') -url="http://www.multiprecision.org/" -license=('LGPL') -depends=('mpfr>=3.0.0') -options=('!libtool') -install=libmpc.install -source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) -md5sums=('13370ceb2e266c5eeb2f7e78c24b7858') - -build() { - cd "${srcdir}/mpc-${pkgver}" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/mpc-${pkgver}" - make check -} - -package() { - cd "${srcdir}/mpc-${pkgver}" - make DESTDIR="${pkgdir}" install - mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info -} diff --git a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch deleted file mode 100644 index 3bf324728..000000000 --- a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- trunk/configure.ac 2011/02/21 12:18:31 932 -+++ trunk/configure.ac 2011/02/21 16:41:09 936 -@@ -33,7 +33,7 @@ - AC_CANONICAL_HOST - AC_CONFIG_MACRO_DIR([m4]) - --dnl Extra arguments to configure -+# Extra arguments to configure - AC_ARG_WITH([mpfr_include], - [AC_HELP_STRING([--with-mpfr-include=DIR], - [MPFR include directory])], -@@ -85,18 +85,19 @@ - ) - - --dnl Setup CC and CFLAGS -+# Setup CC and CFLAGS -+AC_PROG_CC -+AC_LANG(C) - --dnl Check for user specification of CC or CFLAGS -+# Set up LibTool -+AC_PROG_LIBTOOL -+ -+# Check for user specification of CC or CFLAGS - if test -n "$CFLAGS" || test -n "$CC" ; then - user_redefine_cc=yes - fi - --# Check for programs --AC_PROG_CC --AC_LANG(C) -- --dnl Check GMP Header -+# Check GMP Header - AC_MSG_CHECKING(for gmp.h) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include "gmp.h" -@@ -105,22 +106,19 @@ - AC_MSG_ERROR([gmp.h can't be found, or is unusable.]) - ]) - --dnl Check for GMP CFLAGS in gmp.h -+# Check for GMP CFLAGS in gmp.h - if test -z "$user_redefine_cc" ; then - MPC_GMP_CC_CFLAGS - fi - - --dnl Configs for Windows DLLs -+# Configs for Windows DLLs - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - MPC_WINDOWS - esac - - --dnl Finally set up LibTool --AC_PROG_LIBTOOL -- - # Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h]) diff --git a/testing/libmpc/libmpc.install b/testing/libmpc/libmpc.install deleted file mode 100644 index b0718c745..000000000 --- a/testing/libmpc/libmpc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libmpc.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/libofx/PKGBUILD b/testing/libofx/PKGBUILD deleted file mode 100644 index 218fa0cd3..000000000 --- a/testing/libofx/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 165083 2012-08-10 05:02:43Z eric $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgbase=libofx -pkgname=('libofx' 'libofx-doc') -pkgver=0.9.5 -pkgrel=1 -pkgdesc="API for the OFX banking standard" -arch=('i686' 'x86_64') -url="http://libofx.sourceforge.net" -license=('GPL') -depends=('opensp' 'curl' 'libxml++') -checkdepends=('gnupg') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch) -sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73' - '6c327e24543cb8ba901bfb204343a85c68264654') - -build() { - cd "$srcdir/$pkgbase-$pkgver" - patch -p1 -i "$srcdir/libofx-gcc47.patch" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgbase-$pkgver" - make check -} - -package_libofx() { - options=('!libtool' '!docs') - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install -} - -package_libofx-doc() { - pkgdesc="Documention of the OFX banking standard API" - depends=() - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install-docDATA - make -C doc DESTDIR="$pkgdir" install -} diff --git a/testing/libofx/libofx-gcc47.patch b/testing/libofx/libofx-gcc47.patch deleted file mode 100644 index 899fe09e0..000000000 --- a/testing/libofx/libofx-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff ---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp 2011-03-30 22:30:50.000000000 +0000 -+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp 2012-04-17 06:08:38.711940892 +0000 -@@ -37,6 +37,7 @@ - #include <vector> - #include <algorithm> - #include <string.h> -+#include <unistd.h> - - using std::string; - using std::vector; diff --git a/testing/libxml2/PKGBUILD b/testing/libxml2/PKGBUILD deleted file mode 100644 index 38700a682..000000000 --- a/testing/libxml2/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 165055 2012-08-09 21:18:17Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=libxml2 -pkgver=2.8.0 -pkgrel=1 -pkgdesc="XML parsing library, version 2" -arch=(i686 x86_64) -license=('custom') -depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7' 'xz') -makedepends=('python2') -options=('!libtool') -url="http://www.xmlsoft.org/" -source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - http://www.w3.org/XML/Test/xmlts20080205.tar.gz) -md5sums=('c62106f02ee00b6437f0fb9d370c1093' - 'b255be9a1c7f7021e52448e4ec8d7a0d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py - ./configure --prefix=/usr --with-threads --with-history \ - --with-python=/usr/bin/python2 - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - mv "${srcdir}/xmlconf" . - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/testing/lvm2/lvm-on-crypt.service b/testing/lvm2/lvm-on-crypt.service deleted file mode 100644 index 4ade6c5b0..000000000 --- a/testing/lvm2/lvm-on-crypt.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=LVM activation of encrypted devices -DefaultDependencies=no -Requires=systemd-udev-settle.service -After=systemd-udev-settle.service cryptsetup.target -Before=shutdown.target -Conflicts=shutdown.target - -[Service] -ExecStart=/sbin/vgchange --sysinit --available y -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=basic.target diff --git a/testing/memcached/PKGBUILD b/testing/memcached/PKGBUILD deleted file mode 100644 index 540073226..000000000 --- a/testing/memcached/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 165366 2012-08-16 14:41:50Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> -# Contributor: Michael Irwin <6d6469@gmail.com> - -pkgname=memcached -pkgver=1.4.14 -pkgrel=2 -pkgdesc="A distributed memory object caching system" -arch=(i686 x86_64) -url="http://memcached.org/" -license=('GPL') -depends=('libevent') -optdepends=('perl: for memcached-tool usage') -backup=('etc/conf.d/memcached') -install=memcached.install -source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz - memcached.conf - memcached.sh - memcached.service) -sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef' - '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47' - '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb' - '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool - install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached - install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached - install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service -} diff --git a/testing/memcached/memcached.conf b/testing/memcached/memcached.conf deleted file mode 100644 index 4415e1a55..000000000 --- a/testing/memcached/memcached.conf +++ /dev/null @@ -1,4 +0,0 @@ -# user to run memcached as; also used for pid file ownership -MEMCACHED_USER="memcached" -# see 'memcached -h' for available options -MEMCACHED_ARGS="-l 127.0.0.1 -t 1" diff --git a/testing/memcached/memcached.install b/testing/memcached/memcached.install deleted file mode 100644 index 6009b713f..000000000 --- a/testing/memcached/memcached.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - if ! getent group memcached >/dev/null; then - groupadd --system memcached - fi - if ! getent passwd memcached >/dev/null; then - useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached - passwd -l memcached >/dev/null - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - if getent passwd memcached >/dev/null; then - userdel memcached - fi - if getent group memcached >/dev/null; then - groupdel memcached - fi -} diff --git a/testing/memcached/memcached.service b/testing/memcached/memcached.service deleted file mode 100644 index c6e15fb7c..000000000 --- a/testing/memcached/memcached.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Memcached Daemon -After=network.target - -[Service] -User=memcached -# Remove '-l 127.0.0.1' to listen on all addresses -ExecStart=/usr/bin/memcached -l 127.0.0.1 - -[Install] -WantedBy=multi-user.target diff --git a/testing/memcached/memcached.sh b/testing/memcached/memcached.sh deleted file mode 100644 index 9c9727507..000000000 --- a/testing/memcached/memcached.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/memcached - -PIDFILE='/var/run/memcached.pid' - -getpid() { - local pid - pid=$(cat $PIDFILE 2>/dev/null) - # if the process is no longer valid, don't return it - if [ -n "$pid" ]; then - if ! ps -p $pid >/dev/null; then - rm -f $PIDFILE - pid="" - fi - fi - echo $pid -} - -PID="$(getpid)" - -case "$1" in - start) - stat_busy "Starting memcached" - # memcached is retarded and doesn't write to the pidfile - # before it drops permissions - if [ -n "$PID" ]; then - stat_fail - elif [ -z "$MEMCACHED_USER" ]; then - echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached" - stat_fail - else - touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE - /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon memcached - stat_done - fi - fi - ;; - stop) - stat_busy "Stopping memcached" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $PIDFILE - rm_daemon memcached - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/modemmanager/PKGBUILD b/testing/modemmanager/PKGBUILD deleted file mode 100644 index 403673c39..000000000 --- a/testing/modemmanager/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 165395 2012-08-17 23:24:24Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=modemmanager -_realname=ModemManager -pkgver=0.5.2.0 -pkgrel=3 -pkgdesc="Mobile broadband modem management service" -arch=('i686' 'x86_64') -url="http://cgit.freedesktop.org/ModemManager/ModemManager/" -license=('GPL2') -depends=('dbus-glib' 'udev' 'ppp') -makedepends=('intltool') -optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') -options=('!libtool') -source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz - modem-manager.service) -sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8' - '66c9947972066dd5494c3a18b0e833f236e0866b455675368b5994900cbaf384') - -build() { - cd "$_realname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-udev-base-dir=/usr/lib/udev \ - --disable-static - make -} - -package() { - cd "$_realname-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/modem-manager.service" \ - "$pkgdir/usr/lib/systemd/system/modem-manager.service" - echo "SystemdService=modem-manager.service" \ - >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service" -} diff --git a/testing/modemmanager/modem-manager.service b/testing/modemmanager/modem-manager.service deleted file mode 100644 index 4e0c43c8c..000000000 --- a/testing/modemmanager/modem-manager.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Modem Manager - -[Service] -Type=dbus -BusName=org.freedesktop.ModemManager -ExecStart=/usr/sbin/modem-manager - -[Install] -WantedBy=multi-user.target diff --git a/testing/mysql/PKGBUILD b/testing/mysql/PKGBUILD deleted file mode 100644 index 74a6654e6..000000000 --- a/testing/mysql/PKGBUILD +++ /dev/null @@ -1,133 +0,0 @@ -# $Id: PKGBUILD 165319 2012-08-15 14:54:28Z 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=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.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') -md5sums=('82baf46acfced6eef072e9d8a479c86e' - 'e7eb2faeab755cbb2fe03542bf328da9' - '1c949c0dbea5206af0db14942d9927b6' - '6ea6ceb360d09a774e87335ee098ddd5' - '2fa6e456964d4ff5e6d4f9ff0126aed6' - 'a0e1460c276a50a9666c331de83271f2') - -build() { - mkdir build - cd build - - # CFLAGS/CXXFLAGS as suggested upstream - - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=ON \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ - -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" - - make -} - -package_libmysqlclient(){ - pkgdesc="MySQL client libraries" - depends=('openssl') - - cd build - for dir in include libmysql libmysqld libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -d "${pkgdir}"/usr/bin - install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done -} - -package_mysql-clients(){ - pkgdesc="MySQL client tools" - depends=('libmysqlclient') - - cd build - make -C client DESTDIR="${pkgdir}" install - - # install man pages - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done - - # provided by mysql - rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} -} - -package_mysql(){ - pkgdesc="A fast SQL database server" - backup=('etc/mysql/my.cnf') - install=mysql.install - depends=('mysql-clients' 'systemd-tools') - options=('emptydirs') - - cd build - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf - 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} - rm "${pkgdir}"/usr/lib/libmysql* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - - # provided by mysql-clients - rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 - - # not needed - rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/mysql -} diff --git a/testing/mysql/my.cnf b/testing/mysql/my.cnf deleted file mode 100644 index 9a41b4fc3..000000000 --- a/testing/mysql/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; -# -# where you replace <host>, <user>, <password> by quoted strings and -# <port> by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = <hostname> -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = <username> -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = <password> -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = <port> -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/testing/mysql/mysql.install b/testing/mysql/mysql.install deleted file mode 100644 index a98f1a877..000000000 --- a/testing/mysql/mysql.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - 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(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/testing/mysql/mysqld-post.sh b/testing/mysql/mysqld-post.sh deleted file mode 100755 index 8dc9c4eea..000000000 --- a/testing/mysql/mysqld-post.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/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/testing/mysql/mysqld-tmpfile.conf b/testing/mysql/mysqld-tmpfile.conf deleted file mode 100644 index 6883dc798..000000000 --- a/testing/mysql/mysqld-tmpfile.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/mysqld 0755 mysql mysql - diff --git a/testing/mysql/mysqld.rc b/testing/mysql/mysqld.rc deleted file mode 100755 index 4bbddb5a4..000000000 --- a/testing/mysql/mysqld.rc +++ /dev/null @@ -1,77 +0,0 @@ -#!/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/testing/mysql/mysqld.service b/testing/mysql/mysqld.service deleted file mode 100644 index 0175c685b..000000000 --- a/testing/mysql/mysqld.service +++ /dev/null @@ -1,11 +0,0 @@ -[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/testing/net-tools/Makefile.patch b/testing/net-tools/Makefile.patch deleted file mode 100644 index aaacd6b78..000000000 --- a/testing/net-tools/Makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.old 2012-08-07 22:07:58.235437087 +0200 -+++ Makefile 2012-08-07 22:10:21.192104345 +0200 -@@ -239,12 +239,12 @@ - install -m 0755 -d ${BASEDIR}/bin - install -m 0755 arp ${BASEDIR}/sbin - install -m 0755 hostname ${BASEDIR}/bin -- install -m 0755 ifconfig ${BASEDIR}/bin -+ install -m 0755 ifconfig ${BASEDIR}/sbin - install -m 0755 nameif ${BASEDIR}/sbin - install -m 0755 netstat ${BASEDIR}/bin - install -m 0755 plipconfig $(BASEDIR)/sbin - install -m 0755 rarp ${BASEDIR}/sbin -- install -m 0755 route ${BASEDIR}/bin -+ install -m 0755 route ${BASEDIR}/sbin - install -m 0755 slattach $(BASEDIR)/sbin - ifeq ($(HAVE_IP_TOOLS),1) - install -m 0755 ipmaddr $(BASEDIR)/sbin diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD deleted file mode 100644 index ff89e15c3..000000000 --- a/testing/network-manager-applet/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 165064 2012-08-09 22:48:27Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Arjan Timmerman <arjan@archlinux.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> - -pkgname=network-manager-applet -pkgver=0.9.6.2 -pkgrel=1 -pkgdesc="GNOME frontends to NetWorkmanager" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' - 'gnome-icon-theme' 'mobile-broadband-provider-info' 'iso-codes') -makedepends=('intltool' 'gnome-bluetooth') -optdepends=('gnome-bluetooth: for PAN/DUN support') -options=('!libtool' '!emptydirs') -install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069') - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static \ - --disable-maintainer-mode \ - --disable-migration - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install deleted file mode 100644 index 255ea1f9a..000000000 --- a/testing/network-manager-applet/network-manager-applet.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 0.9.6.0) < 0 )); then - gconfpkg --uninstall network-manager-applet - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD deleted file mode 100644 index 48d521bcf..000000000 --- a/testing/networkmanager-openconnect/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 165062 2012-08-09 22:47:07Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-openconnect -pkgver=0.9.6.2 -pkgrel=1 -pkgdesc="NetworkManager VPN integration for openconnect" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" 'openconnect' 'gconf' 'libgnome-keyring') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0') - -build() { - cd NetworkManager-openconnect-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd NetworkManager-openconnect-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install deleted file mode 100644 index 7bd4d44f9..000000000 --- a/testing/networkmanager-openconnect/networkmanager-openconnect.install +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=networkmanager-openconnect - -post_install() { - getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect - getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect - passwd -l nm-openconnect > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect - getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect -} diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD deleted file mode 100644 index 16f27e614..000000000 --- a/testing/networkmanager-openvpn/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 164976 2012-08-07 18:09:27Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-openvpn -pkgver=0.9.6.0 -pkgrel=1 -pkgdesc="NetworkManager VPN plugin for OpenVPN" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -install=networkmanager-openvpn.install -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3') - -build() { - cd NetworkManager-openvpn-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd NetworkManager-openvpn-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install deleted file mode 100644 index 931c0517c..000000000 --- a/testing/networkmanager-openvpn/networkmanager-openvpn.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD deleted file mode 100644 index b4f975a2c..000000000 --- a/testing/networkmanager-pptp/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 164977 2012-08-07 18:10:19Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-pptp -pkgver=0.9.6.0 -pkgrel=1 -pkgdesc="NetworkManager VPN plugin for pptp " -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -options=('!libtool') -install=networkmanager-pptp.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4') - -build() { - cd NetworkManager-pptp-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd NetworkManager-pptp-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install deleted file mode 100644 index 931c0517c..000000000 --- a/testing/networkmanager-pptp/networkmanager-pptp.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD deleted file mode 100644 index db34ef9c2..000000000 --- a/testing/networkmanager-vpnc/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 164978 2012-08-07 18:11:11Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-vpnc -pkgver=0.9.6.0 -pkgrel=1 -pkgdesc="NetworkManager VPN plugin for vpnc" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -options=('!libtool') -install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2') - -build() { - cd NetworkManager-vpnc-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd NetworkManager-vpnc-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install deleted file mode 100644 index 931c0517c..000000000 --- a/testing/networkmanager-vpnc/networkmanager-vpnc.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf deleted file mode 100644 index c37b59680..000000000 --- a/testing/networkmanager/NetworkManager.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -plugins=keyfile diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD deleted file mode 100644 index e4c927db3..000000000 --- a/testing/networkmanager/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 164974 2012-08-07 18:07:41Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinxu.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> -# Contributor: Valentine Sinitsyn <e_val@inbox.ru> - -pkgname=networkmanager -_pkgname=NetworkManager -pkgver=0.9.6.0 -pkgrel=1 -pkgdesc="Network Management daemon" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/$_pkgname/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' - 'libsoup') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') -optdepends=('modemmanager: for modem management service' - 'dhclient: alternative DHCP/DHCPv6 client' - 'iptables: Connection sharing' - 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support' - 'openresolv: openresolv support') -options=('!libtool') -backup=('etc/NetworkManager/NetworkManager.conf') -install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) -sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' - '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') - -build() { - cd $_pkgname-$pkgver - - patch -Np1 -i ../disable_set_hostname.patch - patch -Np1 -i ../dnsmasq-path.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --with-crypto=nss \ - --with-distro=arch \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-udev-dir=/usr/lib/udev \ - --with-resolvconf=/usr/sbin/resolvconf \ - --with-session-tracking=ck \ - --disable-static \ - --enable-more-warnings=no \ - --disable-wimax - - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - - rm -r "$pkgdir/var/run" - - # Provide native service for arch-daemons generator - ln -s NetworkManager.service "$pkgdir/usr/lib/systemd/system/networkmanager.service" -} diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch deleted file mode 100644 index ee95dd0e1..000000000 --- a/testing/networkmanager/disable_set_hostname.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c ---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 -+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 -@@ -302,6 +302,7 @@ - return; - } - -+#if 0 - /* Try automatically determined hostname from the best device's IP config */ - if (!best4) - best4 = get_best_ip4_device (policy->manager, &best_req4); -@@ -356,6 +357,7 @@ - } - } - -+#endif - /* If no automatically-configured hostname, try using the hostname from - * when NM started up. - */ diff --git a/testing/networkmanager/dnsmasq-path.patch b/testing/networkmanager/dnsmasq-path.patch deleted file mode 100644 index c0e713266..000000000 --- a/testing/networkmanager/dnsmasq-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c ---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 -@@ -52,8 +52,11 @@ - find_dnsmasq (void) - { - static const char *paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; -diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c ---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 -@@ -170,8 +170,11 @@ - nm_find_dnsmasq (void) - { - static const char *dnsmasq_binary_paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install deleted file mode 100644 index de40c17ed..000000000 --- a/testing/networkmanager/networkmanager.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG -ATTENTION: - /etc/NetworkManager/nm-system-settings.conf has been replaced - by /etc/NetworkManager/NetworkManager.conf. Make sure you move - any custom settings to the new config file. -MSG - true -} diff --git a/testing/networkmanager/systemd-fallback.patch b/testing/networkmanager/systemd-fallback.patch deleted file mode 100644 index f5acc9dc6..000000000 --- a/testing/networkmanager/systemd-fallback.patch +++ /dev/null @@ -1,470 +0,0 @@ -diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac ---- NetworkManager-0.9.3.995/configure.ac 2012-03-02 01:05:21.000000000 +0100 -+++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac 2012-03-06 16:55:58.294793902 +0100 -@@ -344,7 +344,7 @@ - case $with_session_tracking in - ck|none) ;; - systemd) -- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) -+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) - ;; - *) - AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd]) -diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c ---- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c 2012-02-27 16:57:16.000000000 +0100 -+++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c 2012-03-06 16:55:01.285264295 +0100 -@@ -28,6 +28,10 @@ - #include <glib/gstdio.h> - #include <systemd/sd-login.h> - #include <stdlib.h> -+#include <systemd/sd-daemon.h> -+#include <sys/stat.h> -+#include <gio/gio.h> -+#include "nm-logging.h" - - #include "nm-session-utils.h" - #include "nm-session-monitor.h" -@@ -107,10 +111,20 @@ - return source; - } - -+/********************************************************************/ -+ -+#define CKDB_PATH "/var/run/ConsoleKit/database" -+ - struct _NMSessionMonitor { - GObject parent_instance; - - GSource *sd_source; -+ -+ GKeyFile *database; -+ GFileMonitor *database_monitor; -+ time_t database_mtime; -+ GHashTable *sessions_by_uid; -+ GHashTable *sessions_by_user; - }; - - struct _NMSessionMonitorClass { -@@ -130,6 +144,215 @@ - - /* ---------------------------------------------------------------------------------------------------- */ - -+typedef struct { -+ char *user; -+ uid_t uid; -+ gboolean local; -+ gboolean active; -+} Session; -+ -+static void -+session_free (Session *s) -+{ -+ g_free (s->user); -+ memset (s, 0, sizeof (Session)); -+ g_free (s); -+} -+ -+static gboolean -+check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error) -+{ -+ if (g_key_file_has_key (keyfile, group, key, error)) -+ return TRUE; -+ -+ if (!error) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, -+ "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key", -+ group, key); -+ } -+ return FALSE; -+} -+ -+static Session * -+session_new (GKeyFile *keyfile, const char *group, GError **error) -+{ -+ GError *local = NULL; -+ Session *s; -+ const char *uname = NULL; -+ -+ s = g_new0 (Session, 1); -+ g_assert (s); -+ -+ s->uid = G_MAXUINT; /* paranoia */ -+ if (!check_key (keyfile, group, "uid", &local)) -+ goto error; -+ s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local); -+ if (local) -+ goto error; -+ -+ if (!check_key (keyfile, group, "is_active", &local)) -+ goto error; -+ s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local); -+ if (local) -+ goto error; -+ -+ if (!check_key (keyfile, group, "is_local", &local)) -+ goto error; -+ s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local); -+ if (local) -+ goto error; -+ -+ if (!nm_session_uid_to_user (s->uid, &uname, error)) -+ return FALSE; -+ s->user = g_strdup (uname); -+ -+ return s; -+ -+error: -+ session_free (s); -+ g_propagate_error (error, local); -+ return NULL; -+} -+ -+static void -+session_merge (Session *src, Session *dest) -+{ -+ g_return_if_fail (src != NULL); -+ g_return_if_fail (dest != NULL); -+ -+ g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0); -+ g_warn_if_fail (src->uid == dest->uid); -+ -+ dest->local = (dest->local || src->local); -+ dest->active = (dest->active || src->active); -+} -+ -+/********************************************************************/ -+ -+static void -+free_database (NMSessionMonitor *self) -+{ -+ if (self->database != NULL) { -+ g_key_file_free (self->database); -+ self->database = NULL; -+ } -+ -+ g_hash_table_remove_all (self->sessions_by_uid); -+ g_hash_table_remove_all (self->sessions_by_user); -+} -+ -+static gboolean -+reload_database (NMSessionMonitor *self, GError **error) -+{ -+ struct stat statbuf; -+ char **groups = NULL; -+ gsize len = 0, i; -+ Session *s; -+ -+ free_database (self); -+ -+ errno = 0; -+ if (stat (CKDB_PATH, &statbuf) != 0) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, -+ "Error statting file " CKDB_PATH ": %s", -+ strerror (errno)); -+ goto error; -+ } -+ self->database_mtime = statbuf.st_mtime; -+ -+ self->database = g_key_file_new (); -+ if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error)) -+ goto error; -+ -+ groups = g_key_file_get_groups (self->database, &len); -+ if (!groups) { -+ g_set_error_literal (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_IO_ERROR, -+ "Could not load groups from " CKDB_PATH ""); -+ goto error; -+ } -+ -+ for (i = 0; i < len; i++) { -+ Session *found; -+ -+ if (!g_str_has_prefix (groups[i], "Session ")) -+ continue; -+ -+ s = session_new (self->database, groups[i], error); -+ if (!s) -+ goto error; -+ -+ found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user); -+ if (found) { -+ session_merge (s, found); -+ session_free (s); -+ } else { -+ /* Entirely new user */ -+ g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s); -+ g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s); -+ } -+ } -+ -+ g_strfreev (groups); -+ return TRUE; -+ -+error: -+ if (groups) -+ g_strfreev (groups); -+ free_database (self); -+ return FALSE; -+} -+ -+static gboolean -+ensure_database (NMSessionMonitor *self, GError **error) -+{ -+ gboolean ret = FALSE; -+ -+ if (self->database != NULL) { -+ struct stat statbuf; -+ -+ errno = 0; -+ if (stat (CKDB_PATH, &statbuf) != 0) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, -+ "Error statting file " CKDB_PATH " to check timestamp: %s", -+ strerror (errno)); -+ goto out; -+ } -+ -+ if (statbuf.st_mtime == self->database_mtime) { -+ ret = TRUE; -+ goto out; -+ } -+ } -+ -+ ret = reload_database (self, error); -+ -+out: -+ return ret; -+} -+ -+static void -+on_file_monitor_changed (GFileMonitor * file_monitor, -+ GFile * file, -+ GFile * other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data) -+{ -+ NMSessionMonitor *self = NM_SESSION_MONITOR (user_data); -+ -+ /* throw away cache */ -+ free_database (self); -+ -+ g_signal_emit (self, signals[CHANGED_SIGNAL], 0); -+} -+ - static gboolean - sessions_changed (gpointer user_data) - { -@@ -143,9 +366,50 @@ - static void - nm_session_monitor_init (NMSessionMonitor *monitor) - { -- monitor->sd_source = sd_source_new (); -- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -- g_source_attach (monitor->sd_source, NULL); -+ if (sd_booted () > 0) { -+ monitor->sd_source = sd_source_new (); -+ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -+ g_source_attach (monitor->sd_source, NULL); -+ -+ monitor->database_monitor = NULL; -+ monitor->database = NULL; -+ } else { -+ monitor->sd_source = NULL; -+ -+ GError *error = NULL; -+ GFile *file; -+ -+ /* Sessions-by-user is responsible for destroying the Session objects */ -+ monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal, -+ NULL, (GDestroyNotify) session_free); -+ monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal); -+ -+ -+ error = NULL; -+ if (!ensure_database (monitor, &error)) { -+ /* Ignore the first error if the CK database isn't found yet */ -+ if (g_error_matches (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) { -+ nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message); -+ } -+ g_error_free (error); -+ } -+ -+ error = NULL; -+ file = g_file_new_for_path (CKDB_PATH); -+ monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); -+ g_object_unref (file); -+ if (monitor->database_monitor == NULL) { -+ nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } else { -+ g_signal_connect (monitor->database_monitor, -+ "changed", -+ G_CALLBACK (on_file_monitor_changed), -+ monitor); -+ } -+ } - } - - static void -@@ -158,6 +422,12 @@ - g_source_unref (monitor->sd_source); - } - -+ if (monitor->database_monitor != NULL) -+ g_object_unref (monitor->database_monitor); -+ -+ if (monitor->database != NULL) -+ free_database (monitor); -+ - if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL) - G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object); - } -@@ -206,15 +476,36 @@ - uid_t *out_uid, - GError **error) - { -- uid_t uid; -+ if (monitor->sd_source != NULL) { -+ uid_t uid; - -- if (!nm_session_user_to_uid (username, &uid, error)) -- return FALSE; -+ if (!nm_session_user_to_uid (username, &uid, error)) -+ return FALSE; - -- if (out_uid) -- *out_uid = uid; -+ if (out_uid) -+ *out_uid = uid; - -- return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); -+ return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); -+ } else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for user '%s'", -+ username); -+ return FALSE; -+ } -+ -+ if (out_uid) -+ *out_uid = s->uid; -+ return TRUE; -+ } - } - - gboolean -@@ -222,12 +513,31 @@ - const char *username, - GError **error) - { -- uid_t uid; -+ if (monitor->sd_source != NULL) { -+ uid_t uid; - -- if (!nm_session_user_to_uid (username, &uid, error)) -- return FALSE; -+ if (!nm_session_user_to_uid (username, &uid, error)) -+ return FALSE; -+ -+ return nm_session_monitor_uid_active (monitor, uid, error); -+ } else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for user '%s'", -+ username); -+ return FALSE; -+ } - -- return nm_session_monitor_uid_active (monitor, uid, error); -+ return s->active; -+ } - } - - gboolean -@@ -236,10 +546,31 @@ - const char **out_user, - GError **error) - { -- if (!nm_session_uid_to_user (uid, out_user, error)) -- return FALSE; -+ if (monitor->sd_source != NULL) { -+ if (!nm_session_uid_to_user (uid, out_user, error)) -+ return FALSE; - -- return sd_uid_get_sessions (uid, FALSE, NULL) > 0; -+ return sd_uid_get_sessions (uid, FALSE, NULL) > 0; -+ } else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for uid %d", -+ uid); -+ return FALSE; -+ } -+ -+ if (out_user) -+ *out_user = s->user; -+ return TRUE; -+ } - } - - gboolean -@@ -247,5 +578,24 @@ - uid_t uid, - GError **error) - { -- return sd_uid_get_sessions (uid, TRUE, NULL) > 0; -+ if (monitor->sd_source != NULL) -+ return sd_uid_get_sessions (uid, TRUE, NULL) > 0; -+ else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for uid '%d'", -+ uid); -+ return FALSE; -+ } -+ -+ return s->active; -+ } - } diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD deleted file mode 100644 index ea7443098..000000000 --- a/testing/openvpn/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 165397 2012-08-17 23:28:47Z heftig $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=openvpn -pkgver=2.2.2 -pkgrel=2 -pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" -arch=(i686 x86_64) -url="http://openvpn.net/index.php/open-source.html" -depends=('openssl' 'lzo2' 'iproute2') -license=('custom') -backup=(usr/share/openvpn/easy-rsa/vars - usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf - etc/conf.d/openvpn-tapdev) -source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz - http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc - openvpn@.service - openvpn.rc - openvpn-tapdev.rc - openvpn-tapdev.conf) -md5sums=('c5181e27b7945fa6276d21873329c5c7' - '81ff11ec8cd9fc3c8bc646aae24c4298' - '44047df812a3fcd57a7e36a61732a9b9' - 'a3809b9727f0c2af2d0770f5c7442db2' - 'd2c48e970088d679dd3c2afd914ff731' - '722f483c9e3ce2ec66d3301aaf7cf3d5') - -build() { - cd $srcdir/$pkgname-$pkgver - # Build openvpn - CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \ - --prefix=/usr \ - --enable-password-save \ - --mandir=/usr/share/man \ - --enable-iproute2 - make - - # Build plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - make - done -} - -package() { - cd $srcdir/$pkgname-$pkgver - # Install openvpn - make DESTDIR=$pkgdir install - install -d -m755 $pkgdir/etc/openvpn - # Install examples - install -d -m755 $pkgdir/usr/share/openvpn - cp -r sample-config-files $pkgdir/usr/share/openvpn/examples - find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \; - find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \; - # Install license - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - # Install plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so - cd - - done - # Install contrib - install -d -m755 $pkgdir/usr/share/openvpn/contrib - cp -r contrib $pkgdir/usr/share/openvpn - # Install easy-rsa - cd $srcdir/$pkgname-$pkgver - make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa - rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf - # Install rc scripts - install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn - install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev - install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev - install -D -m644 $srcdir/openvpn@.service $pkgdir/usr/lib/systemd/system/openvpn@.service -} diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf deleted file mode 100644 index afa5586dd..000000000 --- a/testing/openvpn/openvpn-tapdev.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# /etc/conf.d/openvpn-tapdev -# -# Place openvpn-tapdev before network into your DAEMONS array -# This will create permanent tap devices which you can use for bridging -# -# Example: -# TAPDEVS="work home" -# Will create two tap devices "work" and "home" -# - -TAPDEVS="" diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc deleted file mode 100755 index 2c51f8248..000000000 --- a/testing/openvpn/openvpn-tapdev.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -. /etc/conf.d/openvpn-tapdev - -case "$1" in - start) - stat_busy "Creating tap devices for OpenVPN ... " - success=0 - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn-tapdev - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Destroying tap devices for OpenVPN ..." - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - rm_daemon openvpn-tapdev - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc deleted file mode 100755 index 96c28b641..000000000 --- a/testing/openvpn/openvpn.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -CFGDIR="/etc/openvpn" -STATEDIR="/var/run/openvpn" - -case "$1" in - start) - stat_busy "Starting OpenVPN ... " - success=0 - mkdir -p "${STATEDIR}" - for cfg in "${CFGDIR}"/*.conf; do - stat_append "$(basename "${cfg}" .conf) " - /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping OpenVPN ..." - for pidfile in "${STATEDIR}"/*.pid; do - stat_append "$(basename "${pidfile}" .pid) " - kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null - rm -f "${pidfile}" - done - rm_daemon openvpn - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openvpn/openvpn@.service b/testing/openvpn/openvpn@.service deleted file mode 100644 index c3de3bdf7..000000000 --- a/testing/openvpn/openvpn@.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=OpenVPN connection to %i -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --cd /etc/openvpn - -[Install] -WantedBy=multi-user.target diff --git a/testing/p11-kit/PKGBUILD b/testing/p11-kit/PKGBUILD deleted file mode 100644 index babf57fa7..000000000 --- a/testing/p11-kit/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 165200 2012-08-12 20:42:41Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=p11-kit -pkgver=0.13 -pkgrel=1 -pkgdesc="Library to work with PKCS#11 modules" -arch=(i686 x86_64) -url="http://p11-glue.freedesktop.org" -license=('BSD') -depends=(glibc) -options=(!libtool) -source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('3892bc07ff54b1b391aad4628911801d') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-module-path=/usr/lib/pkcs11 - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch deleted file mode 100644 index 1404460df..000000000 --- a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch +++ /dev/null @@ -1,83 +0,0 @@ -From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Thu, 28 Apr 2011 09:18:54 +0300 -Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in - EU::CBuilder - -Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), -CFLAGS and LDFLAGS from the environment have overridden the Config.pm -ccflags and ldflags settings. This can cause binary incompatibilities -between the core Perl and extensions built with EU::CBuilder. - -Append to the Config.pm values rather than overriding them. ---- - .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- - dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- - 2 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -index b572312..2255c51 100644 ---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -@@ -40,11 +40,13 @@ sub new { - $self->{config}{$k} = $v unless exists $self->{config}{$k}; - } - $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; -- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; -+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) -+ if defined $ENV{CFLAGS}; - $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; - $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; - $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; -- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; -+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) -+ if defined $ENV{LDFLAGS}; - - unless ( exists $self->{config}{cxx} ) { - my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); -diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t -index c3bf6b5..1bb15aa 100644 ---- a/dist/ExtUtils-CBuilder/t/04-base.t -+++ b/dist/ExtUtils-CBuilder/t/04-base.t -@@ -1,7 +1,7 @@ - #! perl -w - - use strict; --use Test::More tests => 50; -+use Test::More tests => 64; - use Config; - use Cwd; - use File::Path qw( mkpath ); -@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, - "_prepare_mksymlists_args(): got expected arguments for Mksymlists", - ); - -+my %testvars = ( -+ CFLAGS => 'ccflags', -+ LDFLAGS => 'ldflags', -+); -+ -+while (my ($VAR, $var) = each %testvars) { -+ local $ENV{$VAR}; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "honours $var from Config.pm"); -+ -+ $ENV{$VAR} = "-foo -bar"; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, -+ "honours $VAR from the environment"); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "doesn't override $var from Config.pm with $VAR from the environment"); -+} -+ - ##### - - for ($source_file, $object_file, $lib_file) { --- -1.7.4.4 - diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog deleted file mode 100644 index 9add39e20..000000000 --- a/testing/perl/ChangeLog +++ /dev/null @@ -1,66 +0,0 @@ -2011-06-22 Angel Velasquez <angvp@archlinux.org> - * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS - * Fixed #FS22197, FS#22441, FS#24767 - * Rebuilt perl 5.14.1-2 against db 5.2.28 - -2011-06-16 Angel Velasquez <angvp@archlinux.org> - * Fixed #FS24660 - * Rebuilt against db 5.2.28 - -2011-05-16 Angel Velasquez <angvp@archlinux.org> - * perl 5.14.0 - * Removed patch for h2ph warning from 5.12.3 - * Removed provides array, you can use corelist -v 5.14.0 to know the - modules included with the perl core, through Module::CoreList (thx j3nnn1 - for the tip) - -2010-11-07 kevin <kevin@archlinux.org> - - * perl 5.12.2-1 - - Using /usr/bin/*_perl for script directories - -2010-11-06 kevin <kevin@archlinux.org> - - - Removed otherlibdirs directive from Configure - - Removed /usr/*/perl5/site_perl/5.10.1 from INC - - Finally removed legacy dirs /usr/lib/perl5/current and - /usr/lib/perl5/site_perl/current from @INC - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-2 - - Francois updated the provides array. - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-1 - -2010-05-16 kevin <kevin@archlinux.org> - - * perl 5.12.0-2 - -2010-05-12 kevin <kevin@archlinux.org> - - - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh. - This makes the loop variables unnecessary so the script no longer - pollutes the user's environment. - - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support - user built modules. - -2010-05-09 kevin <kevin@archlinux.org> - - * perl 5.12.0-1 - - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402, - path points to non-existant directories - -2010-05-07 kevin <kevin@archlinux.org> - - - Added this changelog. - - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC. - This removes the duplicates and versioned directory entries. - - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix - Fix FS#13808, binaries don't follow FHS. - - Stopped using versioned directories in sitelib and sitearch. - - -# vim: set ft=changelog ts=4 sw=4 et: diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD deleted file mode 100644 index f5f8fa311..000000000 --- a/testing/perl/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 165042 2012-08-09 14:58:00Z bluewind $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: kevin <kevin.archlinux.org> -# Contributor: judd <jvinet.zeroflux.org> -# Contributor: francois <francois.archlinux.org> -pkgname=perl -pkgver=5.16.1 -pkgrel=1 -pkgdesc="A highly capable, feature-rich programming language" -arch=(i686 x86_64) -license=('GPL' 'PerlArtistic') -url="http://www.perl.org" -groups=('base') -depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') -changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 -perlbin.sh -perlbin.csh -provides.pl) -install=perl.install -options=('makeflags' '!purge') -md5sums=('b87358e2c461a898cfd7c334e7dd8993' - '5ed2542fdb9a60682f215bd33701e61a' - '1f0cbbee783e8a6d32f01be5118e0d5e' - '999c3eea6464860704abbb055a0f0896') - -# workaround to let the integrity check find the correct provides array -if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then - true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) -fi - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - if [ "${CARCH}" = "x86_64" ]; then - # for x86_64 - arch_opts="-Dcccdlflags='-fPIC'" - else - # for i686 - arch_opts="" - fi - - ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ - -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ - -Dprivlib=/usr/share/perl5/core_perl \ - -Darchlib=/usr/lib/perl5/core_perl \ - -Dsitelib=/usr/share/perl5/site_perl \ - -Dsitearch=/usr/lib/perl5/site_perl \ - -Dvendorlib=/usr/share/perl5/vendor_perl \ - -Dvendorarch=/usr/lib/perl5/vendor_perl \ - -Dscriptdir=/usr/bin/core_perl \ - -Dsitescript=/usr/bin/site_perl \ - -Dvendorscript=/usr/bin/vendor_perl \ - -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ - -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness -# make test -} - -package() { - # hack to work around makepkg running the subshell in check_sanity() - new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .)) - provides=(${new_provides[@]}) - - cd ${srcdir}/${pkgname}-${pkgver} - make install - - ### Perl Settings ### - # Change man page extensions for site and vendor module builds. - # Use archlinux email address instead of my own. - sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ - -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ - -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ - -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl - - ### CPAN Settings ### - # Set CPAN default config to use the site directories. - sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ - -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm - - ### CPANPLUS Settings ### - # Set CPANPLUS default config to use the site directories. - sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ - -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - - # Profile script to set paths to perl scripts. - install -D -m755 ${srcdir}/perlbin.sh \ - ${pkgdir}/etc/profile.d/perlbin.sh - # Profile script to set paths to perl scripts on csh. (FS#22441) - install -D -m755 ${srcdir}/perlbin.csh \ - ${pkgdir}/etc/profile.d/perlbin.csh - - (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) - (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) - grep -Rl "${pkgdir}" ${pkgdir}/usr | \ - xargs sed -i "s^${pkgdir}^^g" - - # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ - # (FS#16488) - rm -f $pkgdir/usr/share/perl5/core_perl/*.pod - for d in $pkgdir/usr/share/perl5/core_perl/*; do - if [ -d $d -a $(basename $d) != "pod" ]; then - find $d -name *.pod -delete - fi - done - find $pkgdir/usr/lib -name *.pod -delete - find $pkgdir -name .packlist -delete -} diff --git a/testing/perl/digest_eval_hole.diff b/testing/perl/digest_eval_hole.diff deleted file mode 100644 index 47904137b..000000000 --- a/testing/perl/digest_eval_hole.diff +++ /dev/null @@ -1,61 +0,0 @@ -From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001 -From: "Michael G. Schwern" <schwern@pobox.com> -Date: Mon, 3 Oct 2011 19:05:29 +0100 -Subject: Close the eval "require $module" security hole in - Digest->new($algorithm) - -Also the filter was incomplete. - -Bug-Debian: http://bugs.debian.org/644108 - -Patch-Name: fixes/digest_eval_hole.diff ---- - cpan/Digest/Digest.pm | 6 ++++-- - cpan/Digest/t/security.t | 14 ++++++++++++++ - 2 files changed, 18 insertions(+), 2 deletions(-) - create mode 100644 cpan/Digest/t/security.t - -diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm -index 384dfc8..d714434 100644 ---- a/cpan/Digest/Digest.pm -+++ b/cpan/Digest/Digest.pm -@@ -24,7 +24,7 @@ sub new - shift; # class ignored - my $algorithm = shift; - my $impl = $MMAP{$algorithm} || do { -- $algorithm =~ s/\W+//; -+ $algorithm =~ s/\W+//g; - "Digest::$algorithm"; - }; - $impl = [$impl] unless ref($impl); -@@ -35,7 +35,9 @@ sub new - ($class, @args) = @$class if ref($class); - no strict 'refs'; - unless (exists ${"$class\::"}{"VERSION"}) { -- eval "require $class"; -+ my $pm_file = $class . ".pm"; -+ $pm_file =~ s{::}{/}g; -+ eval { require $pm_file }; - if ($@) { - $err ||= $@; - next; -diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t -new file mode 100644 -index 0000000..5cba122 ---- /dev/null -+++ b/cpan/Digest/t/security.t -@@ -0,0 +1,14 @@ -+#!/usr/bin/env perl -+ -+# Digest->new() had an exploitable eval -+ -+use strict; -+use warnings; -+ -+use Test::More tests => 1; -+ -+use Digest; -+ -+$LOL::PWNED = 0; -+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) }; -+is $LOL::PWNED, 0; diff --git a/testing/perl/fix-h2ph-and-tests.patch b/testing/perl/fix-h2ph-and-tests.patch deleted file mode 100644 index a2d176ec6..000000000 --- a/testing/perl/fix-h2ph-and-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001 -From: Robin Barker <rmbarker@cpan.org> -Date: Thu, 22 Apr 2010 11:51:20 +0100 -Subject: [PATCH 1/1] Fix h2ph and test - ---- - lib/h2ph.t | 12 ++++++++++-- - utils/h2ph.PL | 28 +++++++++++++++++++++++----- - 2 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/lib/h2ph.t b/lib/h2ph.t -index 27dd7b9..8d62d46 100644 ---- a/lib/h2ph.t -+++ b/lib/h2ph.t -@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { - exit 0; - } - --plan(4); -+plan(5); - - # quickly compare two text files - sub txt_compare { -@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', - stderr => 1 ); - like( $result, qr/syntax OK$/, "output compiles"); - -+$result = runperl( progfile => '_h2ph_pre.ph', -+ switches => ['-c'], -+ stderr => 1 ); -+like( $result, qr/syntax OK$/, "preamble compiles"); -+ - $result = runperl( switches => ["-w"], -- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); -+ stderr => 1, -+ prog => <<'PROG' ); -+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); -+PROG - is( $result, '', "output free of warnings" ); - - # cleanup -diff --git a/utils/h2ph.PL b/utils/h2ph.PL -index 8f56db4..1255807 100644 ---- a/utils/h2ph.PL -+++ b/utils/h2ph.PL -@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { - exit $Exit; - - sub expr { -- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. -+ if (/\b__asm__\b/) { # freak out -+ $new = '"(assembly code)"'; -+ return -+ } - my $joined_args; - if(keys(%curargs)) { - $joined_args = join('|', keys(%curargs)); -@@ -770,7 +773,7 @@ sub inc_dirs - sub build_preamble_if_necessary - { - # Increment $VERSION every time this function is modified: -- my $VERSION = 2; -+ my $VERSION = 3; - my $preamble = "$Dest_dir/_h2ph_pre.ph"; - - # Can we skip building the preamble file? -@@ -798,7 +801,16 @@ sub build_preamble_if_necessary - # parenthesized value: d=(v) - $define{$_} = $1; - } -- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { -+ if (/^(\w+)\((\w)\)$/) { -+ my($macro, $arg) = ($1, $2); -+ my $def = $define{$_}; -+ $def =~ s/$arg/\$\{$arg\}/g; -+ print PREAMBLE <<DEFINE; -+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } -+ -+DEFINE -+ } elsif -+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { - # float: - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; -@@ -807,8 +819,14 @@ sub build_preamble_if_necessary - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; - } elsif ($define{$_} =~ /^\w+$/) { -- print PREAMBLE -- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; -+ my $def = $define{$_}; -+ if ($isatype{$def}) { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; -+ } else { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { &$def } }\n\n"; -+ } - } else { - print PREAMBLE - "unless (defined &$_) { sub $_() { \"", --- -1.6.5.2.74.g610f9.dirty - diff --git a/testing/perl/perl.install b/testing/perl/perl.install deleted file mode 100644 index a355c5bbe..000000000 --- a/testing/perl/perl.install +++ /dev/null @@ -1,10 +0,0 @@ -# arg 1: the new package version -post_install() { - for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do - [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver - [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver - [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver - done - return 0 -} - diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh deleted file mode 100644 index 535f0b18d..000000000 --- a/testing/perl/perlbin.csh +++ /dev/null @@ -1,15 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh deleted file mode 100755 index 20f830436..000000000 --- a/testing/perl/perlbin.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl - -export PATH - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 - diff --git a/testing/perl/provides.pl b/testing/perl/provides.pl deleted file mode 100644 index d2cdc762e..000000000 --- a/testing/perl/provides.pl +++ /dev/null @@ -1,299 +0,0 @@ -# provides.pl -## -# Script for printing out a provides list of every CPAN distribution -# that is bundled with perl. You can run it before building perl -# or you can run it after building perl. Required modules are in core -# for perl 5.13 and above. It might be nice if this didn't require -# HTTP::Tiny and maybe just used wget or curl. -# -# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at -# cpanmetadb.plackperl.org to cross-reference module files to their -# providing CPAN distribution. Thank you Miyagawa! -# -# - Justin "juster" Davis <jrcd83@gmail.com> - -use warnings 'FATAL' => 'all'; -use strict; - -package Common; - -sub evalver -{ - my ($path, $mod) = @_; - - open my $fh, '<', $path or die "open $path: $!"; - - my $m = ($mod - ? qr/(?:\$${mod}::VERSION|\$VERSION)/ - : qr/\$VERSION/); - - while (my $ln = <$fh>) { - next unless $ln =~ /\s*$m\s*=\s*.+/; - chomp $ln; - my $ver = do { no strict; eval $ln }; - return $ver unless $@; - die qq{$path:$. bad version string in "$ln"\n}; - } - - close $fh; - return undef; -} - - -#----------------------------------------------------------------------------- - -package Dists; - -sub maindistfile -{ - my ($dist, $dir) = @_; - - # libpath is the modern style, installing modules under lib/ - # with dirs matching the name components. - my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm"; - - # dumbpath is an old style where there's no subdirs and just - # a .pm file. - my $dumbpath = $dist; - $dumbpath =~ s/\A.+-//; - $dumbpath .= ".pm"; - - my @paths = ($libpath, $dumbpath); - # Some modules (with simple names like XSLoader, lib, etc) are - # generated by Makefile.PL. Search through their generating code. - push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0; - - for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; } - return undef; -} - -sub module_ver -{ - my ($dist, $dir) = @_; - - my $path = maindistfile($dist, $dir) or return undef; - - my $mod = $dist; - $mod =~ s/-/::/g; - my $ver = Common::evalver($path, $mod); - unless ($ver) { - warn "failed to find version in module file for $dist\n"; - return undef; - } - - return $ver; -} - -sub changelog_ver -{ - my ($dist, $dir) = @_; - - my $path; - for my $tmp (glob "$dir/{Changes,ChangeLog}") { - if (-f $tmp) { $path = $tmp; last; } - } - return undef unless $path; - - open my $fh, '<', $path or die "open: $!"; - while (<$fh>) { - return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/; - return $1 if /\A\s*version\s+([0-9._]+)/i; - } - close $fh; - - return undef; -} - -# for some reason podlators has a VERSION file with perl code in it -sub verfile_ver -{ - my ($dist, $dir) = @_; - - my $path = "$dir/VERSION"; - return undef unless -f $path; # no warning, only podlaters has it - - return Common::evalver($path); -} - -# scans a directory full of nicely separated dist. directories. -sub scan_distroot -{ - my ($distroot) = @_; - opendir my $cpand, "$distroot" or die "failed to open $distroot"; - my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand; - closedir $cpand; - - my @found; - for my $dist (@dists) { - my $distdir = "$distroot/$dist"; - my $ver = (module_ver($dist, $distdir) - || changelog_ver($dist, $distdir) - || verfile_ver($dist, $distdir)); - - if ($ver) { push @found, [ $dist, $ver ]; } - else { warn "failed to find version for $dist\n"; } - } - return @found; -} - -sub find -{ - my ($srcdir) = @_; - return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}"; -} - -#----------------------------------------------------------------------------- - -package Modules; - -use HTTP::Tiny qw(); -use File::Find qw(); -use File::stat; - -*findfile = *File::Find::find; - -sub cpan_provider -{ - my ($module) = @_; - my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module"; - my $http = HTTP::Tiny->new; - my $resp = $http->get($url); - return undef unless $resp->{'success'}; - - my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m - or return undef; - - my $dist = $cpanpath; - $dist =~ s{\A.+/}{}; # remove author directory - $dist =~ s{-[^-]+\z}{}; # remove version and extension - return ($dist eq 'perl' ? undef : $dist); -} - -sub find -{ - my ($srcdir) = @_; - my $libdir = "$srcdir/lib/"; - die "failed to find $libdir directory" unless -d $libdir; - - # Find only the module files that have not changed since perl - # was extracted. We don't want the files perl just recently - # installed into lib/. We processed those already. - my @modfiles; - my $finder = sub { - return unless /[.]pm\z/; - return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules - push @modfiles, $_; - }; - findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir); - - # First we have to find what the oldest ctime actually is. - my $oldest = time; - @modfiles = map { - my $modfile = $_; - my $ctime = (stat $modfile)->ctime; - $oldest = $ctime if $ctime < $oldest; - [ $modfile, $ctime ]; # save ctime for later - } @modfiles; - - # Then we filter out any file that was created more than a - # few seconds after that. Process the rest. - my @mods; - for my $modfile (@modfiles) { - my ($mod, $ctime) = @$modfile; - next if $ctime - $oldest > 5; # ignore newer files - - my $path = $mod; - $mod =~ s{[.]pm\z}{}; - $mod =~ s{\A$libdir}{}; - $mod =~ s{/}{::}g; - - my $ver = Common::evalver($path, $mod) || q{}; - push @mods, [ $mod, $ver ]; - } - - # Convert modules names to the dist names who provide them. - my %seen; - my @dists; - for my $modref (@mods) { - my ($mod, $ver) = @$modref; - my $dist = cpan_provider($mod) or next; # filter out core modules - next if $seen{$dist}++; # avoid duplicate dists - push @dists, [ $dist, $ver ]; - } - return @dists; -} - -#----------------------------------------------------------------------------- - -package Dist2Pkg; - -sub name -{ - my ($name) = @_; - my $orig = $name; - - # Package names should be lowercase and consist of alphanumeric - # characters only (and hyphens!)... - $name =~ tr/A-Z/a-z/; - $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap) - $name =~ tr/-a-z0-9+//cd; # Delete all other chars. - $name =~ tr/-/-/s; - - # Delete leading or trailing hyphens... - $name =~ s/\A-|-\z//g; - - die qq{Dist. name '$orig' completely violates packaging standards} - unless $name; - - return "perl-$name"; -} - -sub version -{ - my ($version) = @_; - - # Package versions should be numbers and decimal points only... - $version =~ tr/-/./; - $version =~ tr/_0-9.-//cd; - - # Remove developer versions because pacman has no special logic - # to compare them to regular versions like perl does. - $version =~ s/_[^_]+\z//; - - $version =~ tr/_//d; # delete other underscores - $version =~ tr/././s; # only one period at a time - $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period - - return $version; -} - -#----------------------------------------------------------------------------- - -package main; - -my %CPANNAME = ('List-Util' => 'Scalar-List-Utils', - 'Text-Tabs' => 'Text-Tabs+Wrap', - 'Cwd' => 'PathTools'); - -my $perldir = shift or die "Usage: $0 [path to perl source directory]\n"; -die "$perldir is not a valid directory." unless -d $perldir; - -my @dists = (Dists::find($perldir), Modules::find($perldir)); -for my $dist (@dists) { - my $name = $dist->[0]; - $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name}; -} - -my @pkgs = map { - my ($name, $ver) = @$_; - $name = Dist2Pkg::name($name); - $ver = Dist2Pkg::version($ver); - [ $name, $ver ]; -} @dists; - -@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs; - -for my $pkg (@pkgs) { - my ($name, $ver) = @$pkg; - print "$name=$ver\n"; -} diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD deleted file mode 100644 index e7f743d8e..000000000 --- a/testing/postgresql/PKGBUILD +++ /dev/null @@ -1,154 +0,0 @@ -# $Id: PKGBUILD 165398 2012-08-17 23:34:22Z heftig $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgbase=postgresql -pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.1.4 -_majorver=${pkgver%.*} -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.postgresql.org/" -license=('custom:PostgreSQL') -makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 - postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate - postgresql.service postgresql-initdb) -md5sums=('a8035688dba988b782725ac1aec60186' - '1ddd1df8010549f237e7983bb326025e' - 'a54d09a20ab1672adf08f037df188d53' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137' - '1ec1fbf1ce998324248c543e6cc2c5e6' - '1488a98a5d5d96a04416e4f5872223bf') -sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712' - '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' - '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' - '7014ccc8f3bbac8be9473a43fca2ed4037ee04e56d8e07d6027b3b4ef0317c89' - 'c22f82a3cf5b555935039853fab2d7e5ff6188cdb1fb528fa9171a87b94f42b0') - -build() { - cd "${srcdir}/postgresql-${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --datadir=/usr/share/postgresql \ - --with-krb5 \ - --with-libxml \ - --with-openssl \ - --with-perl \ - --with-python PYTHON=/usr/bin/python2 \ - --with-tcl \ - --with-pam \ - --with-system-tzdata=/usr/share/zoneinfo \ - --enable-nls \ - --enable-thread-safety - - make world -} - -package_postgresql-libs() { - pkgdesc="Libraries for use with PostgreSQL" - depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0') - provides=('postgresql-client') - conflicts=('postgresql-client') - - cd "${srcdir}/postgresql-${pkgver}" - - # install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" - - # install libs - for dir in src/interfaces src/bin/pg_config src/bin/psql; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" - install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" - - cd src/include - - mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq} - - # these headers are needed by the public headers of the interfaces - install -m644 pg_config.h "${pkgdir}/usr/include/" - install -m644 pg_config_os.h "${pkgdir}/usr/include/" - install -m644 postgres_ext.h "${pkgdir}/usr/include/" - install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/" - install -m644 pg_config_manual.h "${pkgdir}/usr/include/" - - # these headers are needed by the not-so-public headers of the interfaces - install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/" - install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/" - install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/" - install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/" -} - -package_postgresql-docs() { - pkgdesc="HTML documentation for PostgreSQL" - options=(docs) - - cd "${srcdir}/postgresql-${pkgver}" - - # install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE" - - make -C doc/src/sgml DESTDIR="${pkgdir}" install-html - chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/" - - # clean up - rmdir "${pkgdir}"/usr/share/man/man{1,3,7} - rmdir "${pkgdir}"/usr/share/man -} - -package_postgresql() { - pkgdesc="A sophisticated object-relational DBMS" - backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') - depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') - optdepends=('python2: for PL/Python support' - 'perl: for PL/Perl support' - 'tcl: for PL/Tcl support' - 'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade') - install=postgresql.install - - cd "${srcdir}/postgresql-${pkgver}" - - # install - make DESTDIR="${pkgdir}" install - make -C contrib DESTDIR="${pkgdir}" install - make -C doc/src/sgml DESTDIR="${pkgdir}" install-man - - # we don't want these, they are in the -libs package - for dir in src/interfaces src/bin/pg_config src/bin/psql; do - make -C ${dir} DESTDIR="${pkgdir}" uninstall - done - rm "${pkgdir}/usr/share/man/man1/pg_config.1" - rm "${pkgdir}/usr/share/man/man1/psql.1" - - # install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" - - # clean up unneeded installed items - rm -rf "${pkgdir}/usr/include/postgresql/internal" - rm -rf "${pkgdir}/usr/include/libpq" - find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} + - rmdir "${pkgdir}/usr/share/doc/postgresql/html" - - # install launch script - install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" - install -D -m644 "${srcdir}/postgresql.service" \ - "${pkgdir}/usr/lib/systemd/system/postgresql.service" - install -D -m755 "${srcdir}/postgresql-initdb" \ - "${pkgdir}/usr/lib/systemd/scripts/postgresql-initdb" - - # install conf file - install -D -m644 ${srcdir}/postgresql.confd \ - "${pkgdir}/etc/conf.d/postgresql" - - install -D -m644 ${srcdir}/postgresql.pam \ - "${pkgdir}/etc/pam.d/postgresql" - - install -D -m644 ${srcdir}/postgresql.logrotate \ - "${pkgdir}/etc/logrotate.d/postgresql" -} diff --git a/testing/postgresql/postgresql-initdb b/testing/postgresql/postgresql-initdb deleted file mode 100755 index a691a83ff..000000000 --- a/testing/postgresql/postgresql-initdb +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -. /etc/conf.d/postgresql - -# 2nd clause is necessary to prevent symlinking the directory to itself when it -# doesn't exist yet -if [ ! /var/lib/postgres -ef "$PGROOT" ] && [ /var/lib/postgres != "$PGROOT" ]; then - echo "Creating symlink /var/lib/postgres -> $PGROOT" - - # Remove /var/lib/postgres if empty dir, but not if symlink - if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then - rmdir /var/lib/postgres - fi - - ln -sf "$PGROOT" /var/lib/postgres -fi - -PGDATA="$PGROOT/data" - -if [ ! -d "$PGDATA" ]; then - echo "Initializing database in $PGDATA" - - mkdir -p "$PGDATA" - chown -R postgres:postgres "$PGDATA" - - su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null - - if [ -f /etc/postgresql/postgresql.conf ]; then - ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf" - fi -fi diff --git a/testing/postgresql/postgresql.confd b/testing/postgresql/postgresql.confd deleted file mode 100644 index 6001c16d1..000000000 --- a/testing/postgresql/postgresql.confd +++ /dev/null @@ -1,11 +0,0 @@ -## -## Parameters to be passed to postgresql -## -## Default data directory location -#PGROOT="/var/lib/postgres" -## Passed to initdb if necessary -INITOPTS="--locale en_US.UTF-8" -## Default log file location -#PGLOG="/var/log/postgresql.log" -## Additional options to pass via pg_ctl's '-o' option -#PGOPTS="" diff --git a/testing/postgresql/postgresql.install b/testing/postgresql/postgresql.install deleted file mode 100644 index c52432271..000000000 --- a/testing/postgresql/postgresql.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() { - if [ ! -d '/var/lib/postgres' ]; then - mkdir -p '/var/lib/postgres' - fi - getent group postgres >/dev/null || groupadd -g 88 postgres - getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres - passwd -l postgres >/dev/null -} - -post_upgrade() { - post_install $1 - # FS#23858, fix postgres user shell issue - postgres_shell=$(getent passwd postgres | cut -d: -f7) - if [ "$postgres_shell" = "/sbin/nologin" ]; then - chsh -s /bin/bash postgres - fi -} - -post_remove() { - if getent passwd postgres >/dev/null; then - userdel postgres - fi - if getent group postgres >/dev/null; then - groupdel postgres - fi -} diff --git a/testing/postgresql/postgresql.logrotate b/testing/postgresql/postgresql.logrotate deleted file mode 100644 index 9c36918be..000000000 --- a/testing/postgresql/postgresql.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/postgresql.log { - copytruncate - missingok -} diff --git a/testing/postgresql/postgresql.pam b/testing/postgresql/postgresql.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/postgresql/postgresql.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/postgresql/postgresql.rcd b/testing/postgresql/postgresql.rcd deleted file mode 100755 index f3600b30b..000000000 --- a/testing/postgresql/postgresql.rcd +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/postgresql - -# Default PGROOT if it wasn't defined in the conf.d file -PGROOT=${PGROOT:-/var/lib/postgres} -PGLOG=${PGLOG:-/var/log/postgresql.log} -PGCTL_BIN=/usr/bin/pg_ctl -PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w) -[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS") - -postgres_init() { - # initialization - if [[ ! -d "$PGROOT/data" ]]; then - mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT" - su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'" - fi - if [[ ! -e "$PGLOG" ]]; then - touch "$PGLOG" - chown postgres "$PGLOG" - fi -} - -do_postgres() { - su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}" "$@")" -} - -case $1 in - start) - postgres_init - stat_busy "Starting PostgreSQL" - if do_postgres start; then - add_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping PostgreSQL" - if do_postgres stop -m fast; then - rm_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - reload) - stat_busy "Reloading PostgreSQL" - if do_postgres reload; then - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - postgres_init - stat_busy "Restarting PostgreSQL" - if do_postgres restart -m fast; then - add_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - status) - stat_busy "Checking PostgreSQL status"; - ck_status postgresql - ;; - *) - echo "usage: $0 {start|stop|reload|restart|status}" - exit 1 -esac diff --git a/testing/postgresql/postgresql.service b/testing/postgresql/postgresql.service deleted file mode 100644 index 2fcd3e93d..000000000 --- a/testing/postgresql/postgresql.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=PostgreSQL database server - -[Service] -Type=forking -SyslogIdentifier=postgres -PIDFile=/var/lib/postgres/data/postmaster.pid - -# initdb script takes care for symlinking $PGROOT to /var/lib/postgres -ExecStartPre=/usr/lib/systemd/scripts/postgresql-initdb -ExecStart= /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data start" -ExecReload=/bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data reload" -ExecStop= /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data stop -m fast" - -# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in -# killing Postgres -OOMScoreAdjust=-200 - -[Install] -WantedBy=multi-user.target diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD deleted file mode 100644 index 4bfa43e3d..000000000 --- a/testing/proftpd/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 165249 2012-08-14 16:09:40Z andrea $ -# Maintainer: -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4b -pkgrel=2 -epoch=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64') -url="http://www.proftpd.org" -license=('GPL') -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.service') -md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2' - 'e5b9bd78029a15f82994efcb7ed2e9fb' - 'c439a0a1dbc21b604d8382da87aa021b' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736' - '2c446f531948c8cc0a1e0fae28f8dfda') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --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=/run/proftpd \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls \ - --with-systemd - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - - install -d "${pkgdir}/usr/lib/systemd/system/" - install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" -} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd deleted file mode 100755 index 9ea1d47fc..000000000 --- a/testing/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /run/proftpd/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/testing/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/testing/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/proftpd/proftpd.service b/testing/proftpd/proftpd.service deleted file mode 100644 index c202a2fdf..000000000 --- a/testing/proftpd/proftpd.service +++ /dev/null @@ -1,14 +0,0 @@ -[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/testing/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD deleted file mode 100644 index 2d03e6dbb..000000000 --- a/testing/rfkill/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 165297 2012-08-15 01:17:54Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Thomas Bächler <thomas@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=rfkill -pkgver=0.4 -pkgrel=5 -pkgdesc='Tool for enabling and disabling wireless devices' -url='http://linuxwireless.org/en/users/Documentation/rfkill' -license=('custom') -arch=('i686' 'x86_64') -source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'rules.d' - 'service' - 'conf.d' - 'rc.d') -sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b' - '6390eaa793b473098aaa11b13c5254d611a4c13a' - 'cadc563f967c5ac680e7cdfd764718b412201f8a' - 'd969fe927a9fb2926af43a311a7c1fa126fe59a9' - '380af0b002f51543557306ed68a27f0059fd5a6f') - -backup=('etc/conf.d/rfkill') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" - install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service" - install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill" - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill" -} diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD deleted file mode 100644 index a6b0dbb0b..000000000 --- a/testing/spamassassin/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 165370 2012-08-16 16:16:07Z bluewind $ -# Maintainer: Dale Blount <dale@archlinux.org> -# Contributor: Manolis Tzanidakis -pkgname=spamassassin -pkgver=3.3.2 -pkgrel=4 -pkgdesc="A mail filter to identify spam." -arch=('i686' 'x86_64') -license=('APACHE') -url="http://spamassassin.apache.org" -depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl' - 'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http' - 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay') -makedepends=('razor' 'perl-dbi') -optdepends=('razor: to identify collaborately-flagged spam') -backup=('etc/conf.d/spamd' - 'etc/mail/spamassassin/local.cf' - 'etc/mail/spamassassin/init.pre' - 'etc/mail/spamassassin/v310.pre' - 'etc/mail/spamassassin/v312.pre' - 'etc/mail/spamassassin/v320.pre' - 'etc/mail/spamassassin/v330.pre') -install="${pkgname}.install" -options=('!emptydirs') -source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamd.conf.d' 'spamd' 'spamassassin.service') -md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' - 'af501c6b0bb937a2775b747cc4b6d150' - '57545e6877503d897db21e9a2e8bd2b9' - '1c39572b79bc20c822387814050ee5c1') - -build() { - cd "${srcdir}/Mail-SpamAssassin-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ - CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no - make -} - -check() { - cd "${srcdir}/Mail-SpamAssassin-${pkgver}" - - # SSLv2 is disabled by upstream so this test would fail - rm -rf t/spamd_ssl_v2.t - - # parallel tests cause lots of failures; disable for now - #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')" - - make test -} - -package() { - cd "${srcdir}/Mail-SpamAssassin-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" - install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd" - install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce" -} diff --git a/testing/spamassassin/spamassassin.install b/testing/spamassassin/spamassassin.install deleted file mode 100644 index fae0264b2..000000000 --- a/testing/spamassassin/spamassassin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - echo "You must run 'sa-update' to install spam rules before use." -} - -post_upgrade() { - # Compile rules, if rules have previously been compiled, and it's possible - if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]] - echo "Detected compiled rules, running sa-compile..." - sa-compile > /dev/null 2>&1 -fi -} diff --git a/testing/spamassassin/spamassassin.service b/testing/spamassassin/spamassassin.service deleted file mode 100644 index a74f6e644..000000000 --- a/testing/spamassassin/spamassassin.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Spamassassin daemon -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/spamd.pid -ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c -StandardOutput=syslog -StandardError=syslog -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/testing/spamassassin/spamd b/testing/spamassassin/spamd deleted file mode 100644 index 3fb97566e..000000000 --- a/testing/spamassassin/spamd +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE=/var/run/spamd.pid -if [ -f $PIDFILE ]; then - PID=$(cat $PIDFILE) -else - PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat -fi - -case "$1" in - start) - stat_busy "Starting spamd" - [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon spamd - stat_done - fi - ;; - stop) - stat_busy "Stopping spamd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - # Some users report that a second attempt at stopping the process - # works. So, take a little nap and give it another whirl... - sleep 2 - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon spamd - stat_done - fi - else - rm_daemon spamd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/spamassassin/spamd.conf.d b/testing/spamassassin/spamd.conf.d deleted file mode 100644 index 4295e0073..000000000 --- a/testing/spamassassin/spamd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SPAMD_OPTS="-c" diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD deleted file mode 100644 index 6c5931c19..000000000 --- a/testing/subversion/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 165314 2012-08-15 13:09:50Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=subversion -pkgver=1.7.6 -pkgrel=1 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool' '!emptydirs') -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve - svn - svnserve.conf - svnserve.tmpfiles - svnserve.service - subversion-1.7.6-kwallet-gcc47.patch - subversion.rpath.fix.patch) -sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068' - 'd8d99c01c49b189047389816b720923f1d9dbf2a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' - '9f6790d842cf3e0228b007483a43e39a42724068' - 'aa0d01e606de2ebc5eed9c533d218d37a217c50c' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python2 - - patch -p0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - - patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch - - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet - - make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all - make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} - make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ - swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl #install-swig-rb - - install -dm755 "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - - ## svnserve ... - - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - - # ... systemd - install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service - install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf - - # ... common config - install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - - install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/usr/share/bash-completion/completions/subversion - for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do - ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} - done -} diff --git a/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch b/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch deleted file mode 100644 index a571c3c3c..000000000 --- a/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp ---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 -+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 -@@ -60,6 +60,9 @@ - /* KWallet simple provider, puts passwords in KWallet */ - /*-----------------------------------------------------------------------*/ - -+static int q_argc = 1; -+static char q_argv0[] = "svn"; // Build non-const char * from string constant -+static char *q_argv[] = { q_argv0 }; - - static const char * - get_application_name(apr_hash_t *parameters, -@@ -175,6 +178,10 @@ - "kwallet-initialized", - APR_HASH_KEY_STRING, - NULL); -+ apr_hash_set(parameters, -+ "kwallet-wallet", -+ APR_HASH_KEY_STRING, -+ NULL); - } - return APR_SUCCESS; - } -@@ -203,12 +210,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), -@@ -273,12 +279,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch deleted file mode 100644 index ba6ee9e4e..000000000 --- a/testing/subversion/subversion.rpath.fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/svn b/testing/subversion/svn deleted file mode 100644 index 8988aaf63..000000000 --- a/testing/subversion/svn +++ /dev/null @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/testing/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf deleted file mode 100644 index 37fb7ea10..000000000 --- a/testing/subversion/svnserve.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" diff --git a/testing/subversion/svnserve.service b/testing/subversion/svnserve.service deleted file mode 100644 index d8a8e10c1..000000000 --- a/testing/subversion/svnserve.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Subversion protocol daemon -After=syslog.target network.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/svnserve -ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS - -[Install] -WantedBy=multi-user.target diff --git a/testing/subversion/svnserve.tmpfiles b/testing/subversion/svnserve.tmpfiles deleted file mode 100644 index e8487d373..000000000 --- a/testing/subversion/svnserve.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -D /run/svnserve 0700 root root - diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index cc41c6564..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 165301 2012-08-15 06:24:22Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.5p3 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc="Give certain users the ability to run some commands as root" -arch=('i686' 'x86_64') -url="http://www.sudo.ws/sudo/" -license=('custom') -depends=('glibc' 'pam') -backup=('etc/sudoers' 'etc/pam.d/sudo') -options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} - sudo.pam) -md5sums=('aa50e0a9ca02ac35d1020881bd3a221f' - 'aceea97d5f4fe063d6803bead339364d' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -check() { - cd "$srcdir/$pkgname-$_ver" - make check -} - -package() { - cd "$srcdir/$pkgname-$_ver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - - install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" -} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam deleted file mode 100644 index 4e586cd22..000000000 --- a/testing/sudo/sudo.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so diff --git a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch b/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch deleted file mode 100644 index 5c6085c95..000000000 --- a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Fri, 10 Aug 2012 11:02:03 -0400 -Subject: [PATCH] shutdown: recursively mark root as private before pivot - -Because root is now recursively marked as shared on bootup, we need to -recursively mark root as private. This prevents a pivot_root failure on -shutdown: - - Cannot finalize remaining file systems and devices, giving up. - pivot failed: Invalid argument ---- - src/core/shutdown.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/shutdown.c b/src/core/shutdown.c -index 105a604..0b7cbd8 100644 ---- a/src/core/shutdown.c -+++ b/src/core/shutdown.c -@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) { - It works for pivot_root, but the ref count for the root device - is not decreasing :-/ - */ -- if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) { -+ if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) { - log_error("Failed to make \"/\" private mount %m"); - return -errno; - } --- -1.7.11.4 - diff --git a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch b/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch deleted file mode 100644 index 3aec94edc..000000000 --- a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c516c8d17f77a1c761447f4c40c8dfffeda2e06d Mon Sep 17 00:00:00 2001 -From: Simon Peeters <peeters.simon@gmail.com> -Date: Fri, 10 Aug 2012 17:32:19 +0200 -Subject: [PATCH] systemctl: fix issue with systemctl daemon-reexec - ---- - src/shared/dbus-common.c | 3 ++- - src/systemctl/systemctl.c | 11 ++++++++--- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c -index 7f0dce5..da2dc2e 100644 ---- a/src/shared/dbus-common.c -+++ b/src/shared/dbus-common.c -@@ -1287,7 +1287,8 @@ int bus_method_call_with_reply(DBusConnection *bus, - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); - dbus_message_unref(m); - if (!reply) { -- log_error("Failed to issue method call: %s", bus_error_message(&error)); -+ if (!return_error) -+ log_error("Failed to issue method call: %s", bus_error_message(&error)); - if (bus_error_is_no_service(&error)) - r = -ENOENT; - else if (dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) -diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 2e0aaaa..13e0f91 100644 ---- a/src/systemctl/systemctl.c -+++ b/src/systemctl/systemctl.c -@@ -1537,11 +1537,12 @@ static int start_unit_one( - DBUS_TYPE_INVALID); - free(n); - if (r) { -- if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) { -+ if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) - /* There's always a fallback possible for - * legacy actions. */ - r = -EADDRNOTAVAIL; -- } -+ else -+ log_error("Failed to issue method call: %s", bus_error_message(error)); - goto finish; - } - -@@ -3143,6 +3144,7 @@ finish: - static int daemon_reload(DBusConnection *bus, char **args) { - int r; - const char *method; -+ DBusError error; - - if (arg_action == ACTION_RELOAD) - method = "Reload"; -@@ -3171,7 +3173,7 @@ static int daemon_reload(DBusConnection *bus, char **args) { - "org.freedesktop.systemd1.Manager", - method, - NULL, -- NULL, -+ &error, - DBUS_TYPE_INVALID); - - if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL) -@@ -3182,6 +3184,9 @@ static int daemon_reload(DBusConnection *bus, char **args) { - /* On reexecution, we expect a disconnect, not - * a reply */ - r = 0; -+ else if (r) -+ log_error("Failed to issue method call: %s", bus_error_message(&error)); -+ dbus_error_free(&error); - - return r; - } --- -1.7.11.4 - diff --git a/testing/timidity++/PKGBUILD b/testing/timidity++/PKGBUILD deleted file mode 100644 index cec8e8a35..000000000 --- a/testing/timidity++/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 165420 2012-08-18 23:03:32Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=timidity++ -pkgver=2.14.0 -pkgrel=3 -pkgdesc="A MIDI to WAVE converter and player" -arch=('i686' 'x86_64') -url="http://timidity.sourceforge.net" -license=('GPL') -depends=('libao' 'libvorbis' 'jack' 'ncurses') -makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw') -optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \ - 'xaw3d: for using the Xaw interface') -backup=('etc/timidity++/timidity.cfg') -source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \ - timidity.cfg timidity++.sh timidity.service) -sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b' - '660b3afbb720d26e8f008034cee66dd8da082d6e' - '9f3e732a7ca1e97119a76df62ecf154df04d4f77' - 'f0351b9eb8928d3d82c380107654a7dbe7cd2d54') - -build() { - cd "${srcdir}/TiMidity++-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \ - --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \ - --enable-audio=alsa,oss,ao,vorbis,flac,jack \ - --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk - make -} - -package() { - cd "${srcdir}/TiMidity++-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg" - install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++" - install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service" -} diff --git a/testing/timidity++/timidity++.sh b/testing/timidity++/timidity++.sh deleted file mode 100644 index 3fa13cea9..000000000 --- a/testing/timidity++/timidity++.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/timidity` -case "$1" in - start) - stat_busy "Starting Timidity++ ALSA Daemon" - [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/timidity.pid - add_daemon timidity++ - stat_done - fi - ;; - stop) - stat_busy "Stopping Timidity++ ALSA Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/timidity.pid - rm_daemon timidity++ - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/timidity++/timidity.cfg b/testing/timidity++/timidity.cfg deleted file mode 100644 index 59bbfa935..000000000 --- a/testing/timidity++/timidity.cfg +++ /dev/null @@ -1,29 +0,0 @@ -# details on this file and other examples see here: -# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg -# http://www.onicos.com/staff/iz/timidity/dist/cfg/ -#---------------------------------------------------------------- -# SoundFont extension configuration -# -# soundfont <filename> [order={0|1}] [remove] -# <filename> is the path of SoundFont file. -# order: 0(preload) or 1(load after GUS). -# remove: disable specified soundfont. -# -# font exclude <tonebank> [<preset> [<keynote>]] -# font order {0|1} <tonebank> [<preset> [<keynote>]] -# <tonebank>: 0-127 -# -# font exclude 128 [<drumset> [<key>]] -# font order {0|1} 128 [<drumset> [<key>]] -#---------------------------------------------------------------- - -# change the next line to point to a soundfont you have -# soundfonts can be found e.g. here: http://www.hammersound.net/ -# soundfont /usr/share/soundfonts/DX7Piano.SF2 - -# you can do manipulations of the soundfont you load like this: -# e.g. removing drumset 99 -# font exclude 128 99 - -# load drum samples after GUS patches -# font order 1 128 diff --git a/testing/timidity++/timidity.service b/testing/timidity++/timidity.service deleted file mode 100644 index 4d6ceea6a..000000000 --- a/testing/timidity++/timidity.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=TiMidity++ Daemon -After=sound.target - -[Service] -ExecStart=/usr/bin/timidity -iA - -[Install] -WantedBy=multi-user.target diff --git a/testing/transmission/PKGBUILD b/testing/transmission/PKGBUILD deleted file mode 100644 index ca972d116..000000000 --- a/testing/transmission/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# $Id: PKGBUILD 165349 2012-08-16 08:25:26Z tomegun $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -pkgbase=transmission -pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.61 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.transmissionbt.com/" -license=('MIT') -makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') -source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz - transmissiond transmissiond.conf transmission.systemd - transmission.tmpfiles) - -build() { - cd "$pkgbase-$pkgver" - - ./configure --prefix=/usr - make - pushd qt - qmake qtr.pro - make -} -package_transmission-cli() { - pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" - depends=('curl' 'libevent') - backup=('etc/conf.d/transmissiond') - install=transmission-cli.install - - cd "$pkgbase-$pkgver" - - for dir in daemon cli web utils - do - make -C "$dir" DESTDIR="$pkgdir" install - done - - install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" - install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" - install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" - install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" - ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service" - install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" -} - -package_transmission-gtk() { - pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)" - depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') - optdepends=('notification-daemon: Desktop notification support' - 'transmission-cli: daemon and web support') - install=transmission-gtk.install - - cd "$pkgbase-$pkgver" - - make -C gtk DESTDIR="$pkgdir" install - make -C po DESTDIR="$pkgdir" install - install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING" -} - -package_transmission-qt() { - pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" - depends=('curl' 'qt' 'libevent') - optdepends=('transmission-cli: daemon and web support') - install=transmission-qt.install - - cd "$pkgbase-$pkgver" - - make -C qt INSTALL_ROOT="$pkgdir"/usr install - - install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING" - install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png" - install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop" -} -md5sums=('2ed5b7815ebda65223bac6bdb09dec42' - '7d6186ee2a852ae3d44980f05063e194' - 'db72b02fee139e8ab416324e6c044d76' - 'ecccabbc301d1024c9ef6a7f4aaa530a' - '23f2320361ad54373c3a4551ef634fe8') diff --git a/testing/transmission/transmission-cli.install b/testing/transmission/transmission-cli.install deleted file mode 100644 index d99dcf8b7..000000000 --- a/testing/transmission/transmission-cli.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - cat << _EOF - - If you want to run the Transmission daemon at boot, - add transmissiond to the DAEMONS array in /etc/rc.conf. - -_EOF -} - -post_upgrade() { - # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files - getent group transmission >/dev/null || groupadd -g 169 transmission - getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -s /bin/false transmission - passwd -l transmission &>/dev/null - systemd-tmpfiles --create transmission.conf -} diff --git a/testing/transmission/transmission-gtk.install b/testing/transmission/transmission-gtk.install deleted file mode 100644 index c317fbaca..000000000 --- a/testing/transmission/transmission-gtk.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/transmission/transmission-qt.install b/testing/transmission/transmission-qt.install deleted file mode 100644 index e111ef946..000000000 --- a/testing/transmission/transmission-qt.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/transmission/transmissiond b/testing/transmission/transmissiond deleted file mode 100644 index ea3d770f9..000000000 --- a/testing/transmission/transmissiond +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/transmissiond - -PID=`pidof -o %PPID /usr/bin/transmission-daemon` -case "$1" in - start) - stat_busy "Starting Transmission Daemon" - [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon transmissiond - stat_done - fi - ;; - stop) - stat_busy "Stopping Transmission Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon transmissiond - stat_done - fi - ;; - restart) - $0 stop - while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done - $0 start - ;; - reload) - stat_busy "Reloading config" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/testing/transmission/transmissiond.conf b/testing/transmission/transmissiond.conf deleted file mode 100644 index 45a9fd51d..000000000 --- a/testing/transmission/transmissiond.conf +++ /dev/null @@ -1,4 +0,0 @@ -# example configuration file - -# TRANS_USER="transmission" -# TRANS_ARGS="" diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD deleted file mode 100644 index f7fbd187d..000000000 --- a/testing/udisks/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 165394 2012-08-17 23:23:28Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=udisks -pkgver=1.0.4 -pkgrel=5 -pkgdesc="Disk Management Service" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/udisks" -license=('GPL') -depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') -makedepends=('intltool' 'docbook-xsl') -options=(!libtool) -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service) -sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5' - '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/udisks --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" - - # move udev helpers and rules to /usr/lib - mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ - rm -r "${pkgdir}"/lib - - install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" - echo "SystemdService=udisks.service" \ - >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" -} diff --git a/testing/udisks/udisks.service b/testing/udisks/udisks.service deleted file mode 100644 index 7105e90be..000000000 --- a/testing/udisks/udisks.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=UDisks - -[Service] -Type=dbus -BusName=org.freedesktop.UDisks -ExecStart=/usr/lib/udisks/udisks-daemon - -[Install] -WantedBy=graphical.target diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/testing/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD deleted file mode 100644 index d58b4682b..000000000 --- a/testing/xorg-server/PKGBUILD +++ /dev/null @@ -1,190 +0,0 @@ -# $Id: PKGBUILD 165036 2012-08-09 10:16:20Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.3.901 -pkgrel=1 -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' - 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' - 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -sha256sums=('5265cfe935e2ad54a287dd3026917c6bfe6191a4f943ca893d1477fdfbe94b2b' - '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - conflicts=('nvidia-utils<=290.10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index 6d5220ac7..000000000 --- a/testing/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,23 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch deleted file mode 100644 index 0b50049db..000000000 --- a/testing/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ - break; - } - break; -- case 0x1039: -- driverList[0] = "sis"; -- break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: - driverList[0] = "siliconmotion"; - break; diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/testing/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/testing/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD index 7d2d8ad07..80f69a123 100644 --- a/~fauno/notmuch/PKGBUILD +++ b/~fauno/notmuch/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Richard Murri <admin@richardmurri.com> pkgname=notmuch -pkgver=0.13.2 +pkgver=0.14 pkgrel=1 pkgdesc="Notmuch is not much of an email program" arch=(i686 x86_64 mips64el) @@ -65,4 +65,4 @@ package(){ # Remove conflicting zsh completion rm -r ${pkgdir}/usr/share/zsh } -md5sums=('13be4cf1ab2be49b42fec87c3cb44a5a') +md5sums=('5eb3f225d3eb37862932f6baa5780d15') |