diff options
author | root <root@rshg054.dnsready.net> | 2013-05-25 00:28:13 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-05-25 00:28:13 -0700 |
commit | 2333a0e547f378ad697f35312d6ba6d3fbafb2c8 (patch) | |
tree | cb9c92701c40feb373936bffe4190081f8253170 /core | |
parent | 0520c5091743d9910278e53fa32470b096825fb3 (diff) |
Sat May 25 00:28:12 PDT 2013
Diffstat (limited to 'core')
-rw-r--r-- | core/cracklib/PKGBUILD | 6 | ||||
-rw-r--r-- | core/dmraid/PKGBUILD | 10 | ||||
-rw-r--r-- | core/dmraid/dmraid.service | 2 | ||||
-rw-r--r-- | core/dmraid/dmraid_install | 1 | ||||
-rw-r--r-- | core/gawk/PKGBUILD | 20 | ||||
-rw-r--r-- | core/libsasl/PKGBUILD | 38 | ||||
-rw-r--r-- | core/libsasl/saslauthd.service | 11 | ||||
-rw-r--r-- | core/libsasl/tmpfiles.conf | 1 | ||||
-rw-r--r-- | core/linux-atm/PKGBUILD | 6 | ||||
-rw-r--r-- | core/popt/PKGBUILD | 6 | ||||
-rw-r--r-- | core/xfsprogs/PKGBUILD | 10 | ||||
-rw-r--r-- | core/xinetd/PKGBUILD | 19 | ||||
-rw-r--r-- | core/xinetd/xinetd.service | 2 |
13 files changed, 76 insertions, 56 deletions
diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index 8c011e401..d3adf5ee8 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185681 2013-05-17 08:28:48Z tpowa $ +# $Id: PKGBUILD 186294 2013-05-24 07:56:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib pkgver=2.8.22 -pkgrel=2 +pkgrel=3 pkgdesc="Password Checking Library" arch=('i686' 'x86_64') license=('GPL') @@ -16,7 +16,7 @@ md5sums=('463177b5c29c7a598c991e12a4898e06') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-python + ./configure --prefix=/usr --sbindir=/usr/bin --without-python make } diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 37f3ed5c5..25b6829a8 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173944 2012-12-28 19:27:14Z dreisner $ +# $Id: PKGBUILD 186295 2013-05-24 07:56:32Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=8 +pkgrel=9 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -19,10 +19,10 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid.service) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - 'dea048cc09b49b02da1009adae563866' + '7a040ebcba305aba1e47dfe6ca8323b5' 'faec669dc85f87187b45b5d3968efe2c' '56a8bb0ece8d206cd8efb504ee072ddd' - '1cd201496e52bd05c1c3048bf6dd809f') + 'ea6d280fc6f63fb799abcd882bca53c8') build() { cd "$pkgname/1.0.0.rc16-3/$pkgname" @@ -32,7 +32,7 @@ build() { package() { cd "$pkgname/1.0.0.rc16-3/$pkgname" - make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install + make DESTDIR="$pkgdir" sbindir=/usr/bin prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service index a31f8b39f..c5d3d5309 100644 --- a/core/dmraid/dmraid.service +++ b/core/dmraid/dmraid.service @@ -8,7 +8,7 @@ Conflicts=shutdown.target [Service] Type=oneshot -ExecStart=/sbin/dmraid --ignorelocking --activate y -Z +ExecStart=/usr/bin/dmraid --ignorelocking --activate y -Z RemainAfterExit=true [Install] diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index 2003b5cdf..acbc43d95 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -6,6 +6,7 @@ build() { add_binary 'dmraid' add_binary 'dmsetup' + add_file "/usr/lib/device-mapper/libdmraid-events-isw.so" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index 7ad1645ab..b8ff224f6 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 174267 2013-01-03 13:58:07Z allan $ +# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk -pkgver=4.0.2 +pkgver=4.1.0 pkgrel=1 pkgdesc="GNU version of awk" arch=('i686' 'x86_64') -url="http://www.gnu.org/directory/GNU/gawk.html" +url="http://www.gnu.org/software/gawk/" license=('GPL') groups=('base' 'base-devel') -depends=('sh' 'glibc') +depends=('sh' 'glibc' 'mpfr') provides=('awk') install=gawk.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('4d505dc2c9f1eb3e9f8d6cac87d4bd1a' - '131f79e5aa1528649c90ccf0440db0a6') +md5sums=('13e02513105417818a31ef375f9f9f42' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib + ./configure --prefix=/usr --libexecdir=/usr/lib --without-libsigsegv make } @@ -32,7 +32,7 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/bin - ln -sf /usr/bin/gawk ${pkgdir}/bin/ - ln -sf gawk ${pkgdir}/bin/awk + #install -dm755 ${pkgdir}/bin + #ln -sf /usr/bin/gawk ${pkgdir}/bin/ + #ln -sf gawk ${pkgdir}/bin/awk } diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index a9b159b17..b99f0afd4 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 185567 2013-05-15 08:03:34Z bpiotrowski $ +# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> -# This package spans multiple repositories. +# 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.26 -pkgrel=2 +pkgrel=3 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' 'libmariadbclient' 'libldap' 'krb5' 'openssl') +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch cyrus-sasl-2.1.26-size_t.patch @@ -23,8 +23,10 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.service saslauthd.conf.d - saslauthd) + saslauthd + tmpfiles.conf) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' 'f45aa8c42b32e0569ab3d14a83485b37' @@ -33,12 +35,14 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' '8e7106f32e495e9ade69014fd1b3352a' + '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20') + '75542f613185d5a90520ad0d7d926a20' + '45bb0192d2f188066240b9a66ee6365f') build() { export CFLAGS="$CFLAGS -fPIC" - + cd "${srcdir}/cyrus-sasl-${pkgver}" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" @@ -103,7 +107,7 @@ build() { package_libsasl() { pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" - depends=('openssl' 'krb5') + depends=('openssl') conflicts=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}" @@ -115,21 +119,22 @@ package_libsasl() { rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" } package_cyrus-sasl() { - depends=("libsasl=${pkgver}-${pkgrel}") + depends=("libsasl=${pkgver}" 'krb5') pkgdesc="Cyrus saslauthd SASL authentication daemon" backup=('etc/conf.d/saslauthd') cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 -d "${pkgdir}/etc/conf.d" - install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" - install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + 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 -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" @@ -137,12 +142,13 @@ package_cyrus-sasl() { package_cyrus-sasl-gssapi() { pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + 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/" + cp -a .libs/libgs2.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/" @@ -150,7 +156,7 @@ package_cyrus-sasl-gssapi() { package_cyrus-sasl-ldap() { pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + depends=("libsasl=${pkgver}" 'libldap') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" @@ -163,7 +169,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmariadbclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/core/libsasl/saslauthd.service b/core/libsasl/saslauthd.service new file mode 100644 index 000000000..978dbd37d --- /dev/null +++ b/core/libsasl/saslauthd.service @@ -0,0 +1,11 @@ +[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/core/libsasl/tmpfiles.conf b/core/libsasl/tmpfiles.conf new file mode 100644 index 000000000..7258b1a9f --- /dev/null +++ b/core/libsasl/tmpfiles.conf @@ -0,0 +1 @@ +d /run/saslauthd 0755 root root - - diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD index 745bbd929..4f1d718dc 100644 --- a/core/linux-atm/PKGBUILD +++ b/core/linux-atm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $ +# $Id: PKGBUILD 186297 2013-05-24 07:57:23Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm pkgver=2.5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64') depends=('glibc') @@ -23,7 +23,7 @@ build() { # install firmware in /usr/lib sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc make } diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 96b902656..ccd359899 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $ +# $Id: PKGBUILD 186305 2013-05-24 13:04:43Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=popt pkgver=1.16 -pkgrel=5 +pkgrel=6 pkgdesc="A commandline option parser" arch=('i686' 'x86_64') url="http://rpm5.org" @@ -20,7 +20,7 @@ sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index 213b16a3d..9684df0a6 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 175120 2013-01-14 07:38:18Z tpowa $ +# $Id: PKGBUILD 186296 2013-05-24 07:56:54Z tpowa $ # pkgname=xfsprogs -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') @@ -12,19 +12,19 @@ depends=('util-linux') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('d6159f7a664d95b4c150d580399d4400') +md5sums=('de9f1f45026c2f4e0776058d429ff4b6') build() { cd "${srcdir}/${pkgname}-${pkgver}" export OPTIMIZER="-march=${CARCH/_/-} -O1" export DEBUG=-DNDEBUG - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev + make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev chown -R root $pkgdir chgrp -R root $pkgdir # add hack as we cannot set rootlibdir diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index 3ed7dee87..cb2526137 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162234 2012-06-24 05:44:41Z tpowa $ +# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=xinetd pkgver=2.3.15 -pkgrel=2 +pkgrel=3 pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64') url="http://www.xinetd.org/" @@ -13,29 +13,30 @@ optdepends=('perl: for xconv.pl script') backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz xinetd.conf - xinetd servers services xinetd.service) md5sums=('77358478fd58efa6366accae99b8b04c' 'f109f699a07bc8cfb5791060f5e87f9e' - 'ea37a2794f202e6b953d9b6956dad16a' '21f47b4aa20921cfaddddd9f9a407f81' '9fa2061dc7dd738c8424251deb86f81e' - '08466ed714ea8ba42ad81f6fb3aa62e7') + '38be35b6e7146dc59902e243d9063b4c') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver sed -i "s#${prefix}/man#${prefix}/share/man#" configure - ./configure --prefix=/usr --without-libwrap +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap make } package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install + make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install - install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service index c6f6271fd..1c587e291 100644 --- a/core/xinetd/xinetd.service +++ b/core/xinetd/xinetd.service @@ -3,7 +3,7 @@ Description=A secure replacement for inetd After=network.target [Service] -ExecStart=/usr/sbin/xinetd -dontfork +ExecStart=/usr/bin/xinetd -dontfork ExecReload=/bin/kill -HUP $MAINPID [Install] |