diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/bigloo/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/bind/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/bind/named.service | 10 | ||||
-rw-r--r-- | extra/clamav/PKGBUILD | 29 | ||||
-rw-r--r-- | extra/clamav/install | 4 | ||||
-rw-r--r-- | extra/clamav/service | 10 | ||||
-rw-r--r-- | extra/clamav/service.fresh | 10 | ||||
-rw-r--r-- | extra/gpsd/PKGBUILD | 13 | ||||
-rwxr-xr-x | extra/gpsd/gpsd | 9 | ||||
-rw-r--r-- | extra/gpsd/gpsd.install | 5 | ||||
-rw-r--r-- | extra/lm_sensors/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/lm_sensors/fancontrol.service | 9 | ||||
-rw-r--r-- | extra/ntp/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/ntp/ntpd.service | 12 | ||||
-rw-r--r-- | extra/sane/PKGBUILD | 25 | ||||
-rw-r--r-- | extra/sane/saned.service | 8 | ||||
-rw-r--r-- | extra/sane/saned.socket | 9 | ||||
-rw-r--r-- | extra/scim/PKGBUILD | 9 | ||||
-rw-r--r-- | extra/smartmontools/PKGBUILD | 18 | ||||
-rw-r--r-- | extra/squid/PKGBUILD | 84 | ||||
-rw-r--r-- | extra/squid/squid | 28 | ||||
-rw-r--r-- | extra/squid/squid.cron | 11 | ||||
-rw-r--r-- | extra/squid/squid.service | 13 | ||||
-rw-r--r-- | extra/vala/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/yp-tools/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/yp-tools/domainname.service | 11 | ||||
-rw-r--r-- | extra/ypbind-mt/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/ypbind-mt/ypbind.service | 13 |
28 files changed, 294 insertions, 134 deletions
diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index dddf5cf4b..93ad1c52d 100644 --- a/extra/bigloo/PKGBUILD +++ b/extra/bigloo/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 140975 2011-10-20 08:57:44Z eric $ +# $Id: PKGBUILD 162148 2012-06-22 11:52:24Z juergen $ # Maintainer: Jürgen Hötzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=bigloo -_pkgver=3.7a-2 +_pkgver=3.8c pkgver=${_pkgver/-/_} pkgrel=1 pkgdesc="Fast scheme compiler" arch=('i686' 'x86_64' 'mips64el') url="http://www-sop.inria.fr/mimosa/fp/Bigloo/" license=('GPL' 'LGPL') -depends=('openssl' 'sqlite3' 'alsa-lib') -makedepends=('java-environment' 'emacs' 'zip') -optdepends=('emacs') +depends=() +makedepends=('java-environment' 'emacs' 'zip' 'openssl' 'sqlite' 'alsa-lib' 'flac' 'avahi') +optdepends=('emacs' 'java-environment' 'zip' 'openssl' 'sqlite' 'alsa-lib' 'flac' 'avahi') options=('!makeflags') install=bigloo.install source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz) -md5sums=('1a692b950843e36910e13e0e91f90534') +md5sums=('ceea21b14c8f7270be5223dce713ec6d') build() { cd "${srcdir}/${pkgname}${_pkgver}" ./configure --prefix=/usr \ --enable-ssl \ --enable-sqlite \ + --enable-avahi \ + --enable-flac \ --disable-gstreamer \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --docdir=/usr/share/doc/bigloo \ - --dotnet=no \ --jvm=yes make build compile-bee } diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index 5d400455c..b7b6d159c 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161358 2012-06-10 08:42:53Z bisson $ +# $Id: PKGBUILD 162157 2012-06-22 12:58:04Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -8,7 +8,7 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. pkgver=9.9.1.P1 _pkgver=9.9.1-P1 -pkgrel=1 +pkgrel=2 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' url='http://www.isc.org/software/bind/' @@ -22,6 +22,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named' 'named.conf' 'named.conf.d' + 'named.service' 'named.logrotate' 'localhost.zone' '127.0.0.zone') @@ -31,6 +32,7 @@ sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' '46232e9db243c6c05e170a1781d7a7f413be5d03' '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' '7848edbfb9a848843f57c11c02b0289eefd42d00' + '05fb2346a30dee2f99c40914dd23708729839b64' '9ffb5c3f72390a517aeae557e32349d5d278cb63' '76a0d4cd1b913db177a5a375bebc47e5956866ec' '53be0f1437ebe595240d8dbdd819939582b97fb9') @@ -69,15 +71,16 @@ package() { rmdir "${pkgdir}/var/run" install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ + install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind install -D -m755 ../named "${pkgdir}"/etc/rc.d/named install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named + install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named } diff --git a/extra/bind/named.service b/extra/bind/named.service new file mode 100644 index 000000000..77196f785 --- /dev/null +++ b/extra/bind/named.service @@ -0,0 +1,10 @@ +[Unit] +Description=Internet domain name server + +[Service] +ExecStart=/usr/sbin/named -f -u named +ExecReload=/usr/sbin/rndc reload +ExecStop=/usr/sbin/rndc stop + +[Install] +WantedBy=multi-user.target diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 5fe88e742..06a995bde 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154496 2012-03-29 15:43:20Z bisson $ +# $Id: PKGBUILD 162231 2012-06-24 02:24:03Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav -pkgver=0.97.4 +pkgver=0.97.5 pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' @@ -16,12 +16,16 @@ backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'rc.d' 'conf.d' + 'service' + 'service.fresh' 'logrotate' 'tmpfiles.d' 'config.patch') -sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d' +sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9' 'c9d508c1e5972f0f849d8694c1872455fa9e74de' 'cb116cdab49a810381a515cbcfb6a6c148547f07' + 'df522b0488f3901e491f148c9300f6bae348c605' + 'cda9a087e5593992150cb456e34c5f6f589aca82' '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' '1c8ef193919b041135115170acd6313f008de808') @@ -48,14 +52,17 @@ package() { # Make sure conf files get installed, because make install # doesn't do that if clamav is already installed upon building. - install -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf" - install -D -m644 etc/freshclam.conf "${pkgdir}/etc/clamav/freshclam.conf" + install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf + install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf - install -D -m644 ../tmpfiles.d "${pkgdir}/usr/lib/tmpfiles.d/clamav.conf" - install -D -m644 ../logrotate "${pkgdir}/etc/logrotate.d/clamav" - install -D -m644 ../conf.d "${pkgdir}/etc/conf.d/clamav" - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/clamav" + install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf + install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav + install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav + install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav - # Un-distribute databases to require freshclam. - rm "${pkgdir}"/var/lib/clamav/*.cvd + install -d -o 64 -g 64 "${pkgdir}"/run/clamav + install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav + install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav } diff --git a/extra/clamav/install b/extra/clamav/install index a2092e815..896e187c7 100644 --- a/extra/clamav/install +++ b/extra/clamav/install @@ -1,10 +1,6 @@ post_install() { getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null - - chown -R clamav:clamav /var/lib/clamav - install -o clamav -g clamav -d /run/clamav - install -o clamav -g clamav -d /var/log/clamav } post_remove() { diff --git a/extra/clamav/service b/extra/clamav/service new file mode 100644 index 000000000..5bf9eb14e --- /dev/null +++ b/extra/clamav/service @@ -0,0 +1,10 @@ +[Unit] +Description=clamav daemon + +[Service] +Type=forking +PIDFile=/run/clamav/clamd.pid +ExecStart=/usr/sbin/clamd + +[Install] +WantedBy=multi-user.target diff --git a/extra/clamav/service.fresh b/extra/clamav/service.fresh new file mode 100644 index 000000000..a0a72c2e6 --- /dev/null +++ b/extra/clamav/service.fresh @@ -0,0 +1,10 @@ +[Unit] +Description=clamav updater + +[Service] +Type=forking +PIDFile=/run/clamav/freshclam.pid +ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid + +[Install] +WantedBy=multi-user.target diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index de4cf0cf9..d11fcc7f4 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157357 2012-04-27 21:14:32Z tomegun $ +# $Id: PKGBUILD 162159 2012-06-22 12:58:34Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.5 +pkgver=3.6 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') @@ -72,9 +72,12 @@ package() { install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" + install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service" + install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('e96881798a0ab67aa3cd5f3249f0e536' - 'f6b3718b205be7853d49bae6ef587853' - '1f3402f8e33a7032b9ae6dfd077234f7' +md5sums=('064a5ad75593f8c3ea3fe85010647832' + '6473da46f6bad52d38f88670f84cd92b' + '6602d04bb037bc500424f00f24f58837' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gpsd/gpsd b/extra/gpsd/gpsd index b510a7542..2ca7efe26 100755 --- a/extra/gpsd/gpsd +++ b/extra/gpsd/gpsd @@ -5,15 +5,14 @@ [ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd NAME=gpsd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME/$NAME.pid +DAEMON=/usr/sbin/gpsd +PIDFILE=/run/gpsd.pid PID=$(cat $PIDFILE 2>/dev/null) case "$1" in start) - stat_busy "Starting $NAME" - [ ! -d /var/run/$NAME ] && install -d /var/run/$NAME - [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES} + stat_busy "Starting gpsd" + [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.sock ${GPSD_OPTIONS} ${DEVICES} if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/gpsd/gpsd.install b/extra/gpsd/gpsd.install index ee661fcb1..8f20cf484 100644 --- a/extra/gpsd/gpsd.install +++ b/extra/gpsd/gpsd.install @@ -1,9 +1,4 @@ post_install() { - echo ">>> Note: the supplied gpsd udev rules are device-specific, so" - echo ">>> if your device isn't detected correctly, please use lsusb or" - echo ">>> another suitable tool to determine the proper device IDs and" - echo ">>> use the commented rules to fill in the blanks for your device." - update-desktop-database -q } diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index eda3874fe..325caf164 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155754 2012-04-06 00:24:13Z dreisner $ +# $Id: PKGBUILD 162161 2012-06-22 12:59:02Z dreisner $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/" @@ -15,7 +15,7 @@ backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ - sensord.rc daemonarg.patch linux_3.0.patch) + sensord.rc fancontrol.service daemonarg.patch linux_3.0.patch) sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d' 'a486d9fb6c5b0aff4520f6312106c67f5163f1cf' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' @@ -25,6 +25,7 @@ sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d' 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' '72a60251d1d55a67307dab4105d9f3f01a080af4' + '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' '34241388c4001bfb6e49b7e10da1217e29a258d6' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') @@ -50,4 +51,5 @@ package() { install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" + install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" } diff --git a/extra/lm_sensors/fancontrol.service b/extra/lm_sensors/fancontrol.service new file mode 100644 index 000000000..c86b498f8 --- /dev/null +++ b/extra/lm_sensors/fancontrol.service @@ -0,0 +1,9 @@ +[Unit] +Description=Fan control daemon + +[Service] +PIDFile=/var/run/fancontrol.pid +ExecStart=/usr/sbin/fancontrol + +[Install] +WantedBy=multi-user.target diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 506aadda4..6b7d72b86 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 151736 2012-03-01 21:37:06Z bisson $ +# $Id: PKGBUILD 162162 2012-06-22 12:59:21Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=6 +pkgrel=7 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -18,13 +18,15 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpdate' 'ntp.conf' 'ntpd.conf' - 'logrotate.d') + 'logrotate.d' + 'ntpd.service') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' '4e324e625c1f080b5c028be5092aa71adbf9bd99' '01394b8a952f5edc85d19df8335eeac3980320f4' 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91' '4537d1f58b299d463db5048129cb264511474b0b' - '4f76f7f9ffc8315ff9924f793f272d4f6939b816') + '4f76f7f9ffc8315ff9924f793f272d4f6939b816' + '81df5c4d51cb69bc29363625ff49e2bd388d1fa9') install=install @@ -51,6 +53,7 @@ package() { install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd + install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" cd html diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service new file mode 100644 index 000000000..e0cbf879e --- /dev/null +++ b/extra/ntp/ntpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Network Time Service +After=network.target + +[Service] +Type=forking +PIDFile=/run/ntpd.pid +EnvironmentFile=/etc/conf.d/ntpd.conf +ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid + +[Install] +WantedBy=multi-user.target diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 96ebdb8e2..1bb3c4c6c 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157761 2012-04-29 06:49:21Z allan $ +# $Id: PKGBUILD 162163 2012-06-22 12:59:38Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,24 +6,28 @@ pkgname=sane pkgver=1.0.22 -pkgrel=8 +pkgrel=9 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash' 'net-snmp') +depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libusb-compat' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') install=$pkgname.install -backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) +backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,mustek_usb2.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' 'libv4l-0.8.3.patch' - 'xerox_mfp_fix_usb_devices.patch') + 'xerox_mfp_fix_usb_devices.patch' + 'saned.socket' + 'saned.service') +options=(!libtool) md5sums=('fadf56a60f4776bfb24491f66b617cf5' 'da946cc36fb83612162cf9505986d4b2' 'e645a8921cff9f18ffbdabb2ed885060' - 'cfef73e7db7c28308914d3db6767d852') -options=(!libtool) + 'cfef73e7db7c28308914d3db6767d852' + 'e57e9e15528f47f5f1b3f1411135ed5d' + 'e44bd4c994a52d6f472463d1eb0a03be') build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" @@ -37,6 +41,8 @@ build() { --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ --enable-avahi \ + --enable-pthread \ + --disable-rpath \ --disable-locking make } @@ -58,4 +64,9 @@ package () { # Install the pkg-config file install -D -m644 tools/sane-backends.pc \ "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc" + # install systemd files + install -D -m644 ${srcdir}/saned.socket \ + "${pkgdir}/usr/lib/systemd/system/saned.socket" + install -D -m644 ${srcdir}/saned.service \ + "${pkgdir}/usr/lib/systemd/system/saned@.service" } diff --git a/extra/sane/saned.service b/extra/sane/saned.service new file mode 100644 index 000000000..69e833e7e --- /dev/null +++ b/extra/sane/saned.service @@ -0,0 +1,8 @@ +[Unit] +Description=Scanner Service + +[Service] +Group=scanner +ExecStart=/usr/sbin/saned +StandardInput=socket +StandardError=syslog diff --git a/extra/sane/saned.socket b/extra/sane/saned.socket new file mode 100644 index 000000000..66ef9c9c8 --- /dev/null +++ b/extra/sane/saned.socket @@ -0,0 +1,9 @@ +[Unit] +Description=saned incoming socket + +[Socket] +ListenStream=6566 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index b69339c83..571f37fdc 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157786 2012-04-29 11:52:40Z bisson $ +# $Id: PKGBUILD 162185 2012-06-23 07:47:16Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.13 +pkgver=1.4.14 pkgrel=1 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' @@ -15,20 +15,17 @@ makedepends=('intltool') depends=('libltdl' 'gtk2') backup=('etc/scim/config' 'etc/scim/global') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('dafe08bbdd3faa0324800cb63e44926d71be2e47') +sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - export CXXFLAGS+=' -fpermissive' # so configure detects gettext with gcc-4.7 - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-static \ - --with-gtk-version=2 # still a couple issues with 3 make } diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index e95df0362..41c4f6391 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145192 2011-12-19 12:38:49Z giovanni $ +# $Id: PKGBUILD 162164 2012-06-22 12:59:46Z dreisner $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> @@ -6,12 +6,12 @@ pkgname=smartmontools pkgver=5.42 -pkgrel=3 +pkgrel=4 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libcap-ng') +depends=('gcc-libs' 'libcap-ng' 'bash') backup=('etc/smartd.conf' 'etc/conf.d/smartd') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" @@ -27,16 +27,20 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-drivedb \ - --with-libcap-ng=yes + --with-libcap-ng=yes \ + --with-systemdsystemunitdir=/usr/lib/systemd/system make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir}/ install + sed -i -e "s:sysconfig/smartmontools:conf.d/smartd:g" smartd.service + sed -i -e "s:smartd_opts:SMARTD_ARGS:g" smartd.service + + make DESTDIR="${pkgdir}" install rm -rf ${pkgdir}/etc/rc.d - install -Dm755 ${srcdir}/smartd.rc ${pkgdir}/etc/rc.d/smartd - install -Dm644 ${srcdir}/smartd.conf ${pkgdir}/etc/conf.d/smartd + install -Dm755 ${srcdir}/smartd.rc "${pkgdir}/etc/rc.d/smartd" + install -Dm644 ${srcdir}/smartd.conf "${pkgdir}/etc/conf.d/smartd" } diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD index 3ef694a5a..dfa9e37a5 100644 --- a/extra/squid/PKGBUILD +++ b/extra/squid/PKGBUILD @@ -1,28 +1,35 @@ -# $Id: PKGBUILD 161289 2012-06-08 23:27:08Z dreisner $ +# $Id: PKGBUILD 162165 2012-06-22 13:00:02Z dreisner $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=squid pkgver=3.1.20 -pkgrel=1 +pkgrel=2 pkgdesc="A full-featured Web proxy cache server." arch=('i686' 'x86_64' 'mips64el') url="http://www.squid-cache.org" depends=('openssl' 'pam' 'cron' 'perl' 'libltdl') makedepends=('libcap') license=('GPL') -backup=('etc/squid/squid.conf' 'etc/squid/mime.conf' 'etc/conf.d/squid') +backup=('etc/squid/squid.conf' + 'etc/squid/mime.conf' + 'etc/conf.d/squid') install=squid.install -source=("http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2" - 'squid' 'squid.conf.d' 'squid.pam' 'squid.cron') +source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2" + 'squid' + 'squid.conf.d' + 'squid.pam' + 'squid.cron' + 'squid.service') md5sums=('c4d733a383c0508fd0746d64a2d7278a' - 'd213b0cc1db72b749bb8c88716fdab39' + '02f7b5bd793f778e40834fd6457d2199' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' - '5e17df989e2a74e869790c066f61225b') + 'b499c2b725aefd7bd60bec2f1a9de392' + '20e00e1aa1198786795f3da32db3c1d8') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" # gcc 4.6 doesn't support -fhuge-objects. sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure @@ -32,37 +39,56 @@ build() { sed '/^#cache_dir/ s/100/256/ /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre - ./configure --prefix=/usr --datadir=/usr/share/squid \ - --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \ - --localstatedir=/var --with-logdir=/var/log/squid \ - --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \ + ./configure \ + --prefix=/usr \ + --datadir=/usr/share/squid \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + --localstatedir=/var \ + --with-logdir=/var/log/squid \ + --with-pidfile=/run/squid.pid \ + --enable-auth="basic,digest,ntlm" \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" \ + --enable-storeio="aufs,ufs,diskd" \ --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \ --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \ - --enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \ - --enable-linux-netfilter --enable-ident-lookups \ - --enable-useragent-log --enable-cache-digests --enable-referer-log \ - --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \ - --with-filedescriptors=4096 --with-large-files --enable-arp-acl \ + --enable-delay-pools \ + --enable-arp-acl \ + --enable-ssl \ + --enable-snmp \ + --enable-linux-netfilter \ + --enable-ident-lookups \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-referer-log \ + --enable-arp-acl \ + --enable-htcp \ + --enable-carp \ + --enable-epoll \ + --with-filedescriptors=4096 \ + --with-large-files \ + --enable-arp-acl \ --with-default-user=proxy \ - --enable-async-io --enable-truncate -#some versions have build problems with both async and truncate enabled: -# --enable-async-io + --enable-async-io \ + --enable-truncate make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid - install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid - install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid - install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid + install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid + install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid + install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid + install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" + install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service" + + # random unneeded empty dir... + rmdir "$pkgdir/usr/include" } + # vim: ts=2 sw=2 et ft=sh diff --git a/extra/squid/squid b/extra/squid/squid index 2df1fc72d..da5534427 100644 --- a/extra/squid/squid +++ b/extra/squid/squid @@ -1,23 +1,21 @@ #!/bin/bash # source application-specific settings -SQUID_ARGS= -[ -f /etc/conf.d/squid ] && . /etc/conf.d/squid +[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/squid` -case "$1" in +pidfile=/run/squid.pid +{ read -r PID </run/squid.pid; } 2>/dev/null +if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then + rm /run/squid.pid +fi +case $1 in start) - if [ ! -f /var/cache/squid/swap.state ]; then - stat_busy "Creating squid's swap directories" - /usr/sbin/squid -z - fi stat_busy "Starting squid" - [ -z "$PID" ] && /usr/sbin/squid ${SQUID_ARGS} - if [ $? -gt 0 ]; then + if [[ $PID ]] || ! squid $SQUID_ARGS; then stat_fail else add_daemon squid @@ -27,12 +25,11 @@ case "$1" in stop) stat_busy "Stopping squid" - [ ! -z "$PID" ] && /usr/sbin/squid -k shutdown &> /dev/null - if [ $? -gt 0 ]; then + if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then stat_fail else - # wait for squid to shutdown so we can safely do a restart - while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do + # squid takes forever to shutdown all its listening FDs + while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do stat_append "." sleep 3 done @@ -43,10 +40,9 @@ case "$1" in restart) $0 stop - sleep 5 $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/extra/squid/squid.cron b/extra/squid/squid.cron index c2b5bc9ce..c78e51105 100644 --- a/extra/squid/squid.cron +++ b/extra/squid/squid.cron @@ -1,4 +1,9 @@ -#!/bin/bash +#!/bin/sh -PID=`pidof -o %PPID /usr/sbin/squid` -[ -n "$PID" ] && /usr/sbin/squid -k rotate +# exit without error if no pidfile exists +{ read pid </run/squid.pid; } 2>/dev/null || exit 0 + +# make sure found PID really is a squid process +if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then + /usr/sbin/squid -k rotate +fi diff --git a/extra/squid/squid.service b/extra/squid/squid.service new file mode 100644 index 000000000..9d41cc243 --- /dev/null +++ b/extra/squid/squid.service @@ -0,0 +1,13 @@ +[Unit] +Description=Web Proxy Cache Server +After=network.target + +[Service] +Type=forking +PIDFile=/run/squid.pid +ExecStart=/usr/sbin/squid -sYC +ExecStop=/usr/sbin/squid -k shutdown +ExecReload=/usr/sbin/squid -k reconfigure + +[Install] +WantedBy=multi-user.target diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index 8f3acae5e..358439051 100644 --- a/extra/vala/PKGBUILD +++ b/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156996 2012-04-23 09:10:51Z ibiru $ +# $Id: PKGBUILD 162223 2012-06-23 20:04:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=vala -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64' 'mips64el') @@ -13,15 +13,15 @@ depends=('glib2') makedepends=('libxslt') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657') +sha256sums=('8be28ff6347feecb391220ceb4e2209d32b697278e87ed7fc6c9fb1e9345e0d8') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --enable-vapigen make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index d17e30adc..58f32b083 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 126193 2011-06-02 14:34:36Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# $Id: PKGBUILD 162166 2012-06-22 13:00:08Z dreisner $ +# Mantainer: Tom Gundersen <teg@jklm.no> +# Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=yp-tools pkgver=2.12 -pkgrel=2 +pkgrel=3 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64' 'mips64el') url='http://www.linux-nis.org/nis/yp-tools/' license=('GPL2') depends=('ypbind-mt') -source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz") -sha1sums=('10b0ef5d4c5723e0716d7a1431a900c0ba6ef703') +#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz") +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'domainname.service') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,4 +25,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/service/domainname.service" } +md5sums=('ce1e06d86caa285fa8cd76fdf103f51e' + '8d354b76eb0df9a3b06637bfff87453b') diff --git a/extra/yp-tools/domainname.service b/extra/yp-tools/domainname.service new file mode 100644 index 000000000..035f767c8 --- /dev/null +++ b/extra/yp-tools/domainname.service @@ -0,0 +1,11 @@ +[Unit] +Description=NIS Domainname + +[Service] +Type=oneshot +EnvironmentFile=/etc/conf.d/nisdomainname +ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME +RemainAfterExit=true + +[Install] +WantedBy=multi-user.target diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index 03c6f70fb..49a073967 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150656 2012-02-19 12:54:57Z tomegun $ +# $Id: PKGBUILD 162167 2012-06-22 13:00:20Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,20 +6,20 @@ pkgname=ypbind-mt pkgver=1.33 -pkgrel=4 +pkgrel=5 pkgdesc='Linux NIS daemon' url='http://www.linux-nis.org/nis/ypbind-mt/' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') makedepends=('networkmanager') -depends=('rpcbind' 'openslp' 'dbus-glib') -optdepends=('yp-tools: to set a domain name') +depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools') backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname') #source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'nisdomainname.conf' 'ypbind.conf' - 'ypbind') + 'ypbind' + 'ypbind.service') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -40,9 +40,11 @@ package() { install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname + install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service install -d -m755 "${pkgdir}"/var/yp/binding } md5sums=('692f68ed0476762be4228ce543a5b791' 'e83a85291ea2ee152a78f2c16b0b1185' '229309a989abad27703ac2e6d07dc7ae' - '1f7a4c80414d580c9afb3a08267beed0') + '1f7a4c80414d580c9afb3a08267beed0' + '88a721095e334cd442f4649a151ba9be') diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service new file mode 100644 index 000000000..c59231000 --- /dev/null +++ b/extra/ypbind-mt/ypbind.service @@ -0,0 +1,13 @@ +[Unit] +Description=YP Bind +Requires=rpcbind.service domainname.service +After=rpcbind.service domainname.service network.target +Before=systemd-user-sessions.service + +[Service] +Type=forking +PIDFile=/run/ypbind.pid +ExecStart=/usr/sbin/ypbind + +[Install] +WantedBy=multi-user.target |