diff options
145 files changed, 2599 insertions, 455 deletions
diff --git a/community-staging/deadbeef/PKGBUILD b/community-staging/deadbeef/PKGBUILD new file mode 100644 index 000000000..3f00863c4 --- /dev/null +++ b/community-staging/deadbeef/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 72825 2012-06-23 00:39:43Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Alexey Yakovenko <waker@users.sourceforge.net> + +pkgname=deadbeef +pkgver=0.5.5 +pkgrel=1 +pkgdesc='An audio player for GNU/Linux based on GTK2.' +arch=('i686' 'x86_64') +url='http://deadbeef.sourceforge.net' +license=('GPL2') +depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' + 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate' + 'yasm') +optdepends=('libsamplerate: for Resampler plugin' + 'libvorbis: for Ogg Vorbis playback' + 'libmad: for MP1/MP2/MP3 playback' + 'flac: for FLAC playback' + 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support' + 'imlib2: for artwork plugin' + 'wavpack: for WavPack playback' + 'libsndfile: for Wave playback' + 'libcdio: audio cd plugin' + 'libcddb: audio cd plugin' + 'faad2: for AAC/MP4 support' + 'dbus: for OSD notifications support' + 'pulseaudio: for PulseAudio output plugin' + 'libx11: for global hotkeys plugin' + 'zlib: for Audio Overload plugin' + 'libzip: for vfs_zip plugin') +options=('!libtool') +install='deadbeef.install' +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('7cc10cefda0f4044eea897893e4cc1a9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --disable-ffmpeg + make +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" install +} diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch new file mode 100644 index 000000000..db1c79638 --- /dev/null +++ b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch @@ -0,0 +1,118 @@ +From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Mon, 4 Jul 2011 16:47:25 +0400 +Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT() + +For ffmpeg < 0.5. Copied from libavutil 0.5. + +ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc + +fixes build with lavc 53. + +ffmpeg: fix erroneous version comparisons + +Comparing versions this way: (x.y < x1.y1) is obviously equivalent to +(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1). + +ffmpeg: use av_register_protocol2() if available + +fixes usage with ffmpeg-0.8 +--- + plugins/ffmpeg/ffmpeg.c | 37 ++++++++++++++++++++++++++++++------- + 1 files changed, 30 insertions(+), 7 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index cd7edf4..0cb9955 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -44,6 +44,10 @@ + #define av_register_protocol register_protocol + #endif + ++#ifndef AV_VERSION_INT ++#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) ++#endif ++ + #endif + + //#define trace(...) { fprintf(stderr, __VA_ARGS__); } +@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { + for (i = 0; i < info->fctx->nb_streams; i++) + { + info->ctx = info->fctx->streams[i]->codec; +- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (info->ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + info->codec = avcodec_find_decoder (info->ctx->codec_id); + if (info->codec != NULL) { +@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) { + int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; + int len; + //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size); +-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25) +- len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); +-#else ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0) + len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt); ++#else ++ len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); + #endif + trace ("out: out_size=%d, len=%d\n", out_size, len); + if (len <= 0) { +@@ -418,7 +427,7 @@ static const char *map[] = { + + static int + ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) { +-#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43 ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0) + if (!strlen (fctx->title)) { + // title is empty, this call will set track title to filename without extension + deadbeef->pl_add_meta (it, "title", NULL); +@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams +@@ -704,7 +718,11 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); ++#else + av_register_protocol (&vfswrapper); ++#endif + return 0; + } + +@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL) +-- +1.7.8.4 + diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch new file mode 100644 index 000000000..af8c282c0 --- /dev/null +++ b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch @@ -0,0 +1,25 @@ +From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Thu, 7 Jul 2011 22:31:44 +0400 +Subject: [PATCH 2/2] ffmpeg: version check fix + +--- + plugins/ffmpeg/ffmpeg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index 0cb9955..37c7e80 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -718,7 +718,7 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0) + av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); + #else + av_register_protocol (&vfswrapper); +-- +1.7.8.4 + diff --git a/community-staging/deadbeef/deadbeef.install b/community-staging/deadbeef/deadbeef.install new file mode 100644 index 000000000..fcdbf15fb --- /dev/null +++ b/community-staging/deadbeef/deadbeef.install @@ -0,0 +1,19 @@ +pkgname=deadbeef + +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install + + cat <<EOF +==> ffmpeg support was disabled in this deadbeef release due to +==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon. +EOF +} + +post_remove() { + post_install +} diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index d49b286e4..5b0fad6de 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,30 +1,39 @@ -# $Id: PKGBUILD 65088 2012-02-20 03:35:18Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 72784 2012-06-22 12:49:49Z dreisner $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> # Contributor: cdhotfire <cdhotfire@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> -# Maintainer: Elisamuel Resto <ryuji@simplysam.us> +# Contributor: Elisamuel Resto <ryuji@simplysam.us> pkgname=chrony pkgver=1.26 -pkgrel=2 -pkgdesc="Dial-up friendly NTP daemon and excellent replacement for NTP on desktop systems" +pkgrel=3 +pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" options=('strip') license=('GPL') depends=('readline' 'libcap') backup=('etc/chrony.conf') -source=("http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz" \ - 'chrony') +source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz + rc.d + service) md5sums=('ad6dd619ff1986e4ff780363c64e2246' - 'd8b653c8bcc76cef00aa10fbd3eeb4f7') + 'd8b653c8bcc76cef00aa10fbd3eeb4f7' + 'd78e6189c6f51a2af30a65bdedcdb2eb') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf - install -D -m0755 $srcdir/chrony $pkgdir/etc/rc.d/chrony + + 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 } diff --git a/community/chrony/rc.d b/community/chrony/rc.d new file mode 100644 index 000000000..ec042d798 --- /dev/null +++ b/community/chrony/rc.d @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/chronyd` +case "$1" in + start) + stat_busy "Starting chrony Daemon" + if [ -z "$PID" ]; then + /usr/sbin/chronyd $NTPD_ARGS & + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon chrony + stat_done + fi + ;; + stop) + stat_busy "Stopping chrony Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon chrony + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community/chrony/service b/community/chrony/service new file mode 100644 index 000000000..8bc8da9d2 --- /dev/null +++ b/community/chrony/service @@ -0,0 +1,10 @@ +[Unit] +Description=Chrony Network Time Daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/chronyd +PIDFile=/var/run/chronyd.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/dcron/PKGBUILD b/community/dcron/PKGBUILD index a84c051f3..3b84ce3bf 100644 --- a/community/dcron/PKGBUILD +++ b/community/dcron/PKGBUILD @@ -1,8 +1,10 @@ -# Maintainer: Paul Mattal <paul.archlinux.org> +# $Id: PKGBUILD 72785 2012-06-22 12:49:56Z dreisner $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Paul Mattal <paul.archlinux.org> pkgname=dcron pkgver=4.5 -pkgrel=2 +pkgrel=3 pkgdesc="dillon's lightweight cron daemon" arch=('i686' 'x86_64') license=('GPL') @@ -11,10 +13,12 @@ backup=('var/spool/cron/root' 'etc/conf.d/crond') depends=('bash') provides=('cron') conflicts=('cron') -source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('078833f3281f96944fc30392b1888326') optdepends=('smtp-server: sending cron job output via email') install=$pkgname.install +source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz + service) +md5sums=('078833f3281f96944fc30392b1888326' + '5a68a7aee883738e7f7f8549481bb297') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -41,4 +45,5 @@ package() { install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim" sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps" + install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/dcron.service } diff --git a/community/dcron/service b/community/dcron/service new file mode 100644 index 000000000..59fc64b80 --- /dev/null +++ b/community/dcron/service @@ -0,0 +1,10 @@ +[Unit] +Description=Periodic Command Scheduler + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/crond +ExecStart=/usr/sbin/crond $CROND_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index b7a2c76ab..c2a04b08d 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=69748 +pkgver=72689 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64') @@ -36,18 +36,14 @@ build() { cp -r $_svnmod $_svnmod-build cd $_svnmod-build - # fix build issue -# sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1 - -# winlist-ng fails, add again later -for i in alarm comp-scale cpu diskio deskshow \ - empris engage e-tiling everything-aspell everything-mpris \ + for i in alarm calendar comp-scale cpu diskio deskshow \ + empris engage everything-aspell everything-mpris \ everything-pidgin everything-places everything-shotgun \ everything-tracker everything-wallpaper everything-websearch \ execwatch flame iiirk itask mail mem \ moon mpdule net photo places quickaccess \ - rain slideshow snow taskbar \ - winselector xkbswitch; do + rain slideshow snow taskbar winlist-ng \ + winselector; do cd $i ./autogen.sh --prefix=/usr @@ -59,14 +55,14 @@ done package() { cd $srcdir/$_svnmod-build -for i in alarm comp-scale cpu diskio deskshow \ - empris engage e-tiling everything-aspell everything-mpris \ + for i in alarm calendar comp-scale cpu diskio deskshow \ + empris engage everything-aspell everything-mpris \ everything-pidgin everything-places everything-shotgun \ everything-tracker everything-wallpaper everything-websearch \ execwatch flame iiirk itask mail mem \ moon mpdule net photo places quickaccess \ - rain slideshow snow taskbar \ - winselector xkbswitch; do + rain slideshow snow taskbar winlist-ng \ + winselector; do cd $i make DESTDIR=$pkgdir install diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 7a78acf75..fef5f7723 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68746 2012-04-01 10:44:46Z rvanharen $ +# $Id: PKGBUILD 72779 2012-06-22 09:56:44Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=69794 +pkgver=72689 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('e_dbus-svn' 'edje-svn' 'efreet-svn' 'alsa-lib' 'pm-utils' 'pam' 'eeze-svn') makedepends=('svn') conflicts=('e') -provides=('e') +provides=('e' 'notification-daemon') backup=('etc/enlightenment/sysactions.conf') options=('!libtool') source=('e-applications.menu') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 4728b0266..f2a30efa6 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68744 2012-04-01 10:43:59Z rvanharen $ +# $Id: PKGBUILD 72771 2012-06-22 09:49:33Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=69484 +pkgver=71548 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index f15a0ddd8..36e1a0414 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68734 2012-04-01 10:40:17Z rvanharen $ +# $Id: PKGBUILD 72757 2012-06-22 09:44:19Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=69820 +pkgver=72684 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index cb71570b7..02be1ac81 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68740 2012-04-01 10:42:28Z rvanharen $ +# $Id: PKGBUILD 72764 2012-06-22 09:46:56Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=69815 +pkgver=72679 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index eae57dbb6..4c608ae63 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68730 2012-04-01 10:38:24Z rvanharen $ +# $Id: PKGBUILD 72752 2012-06-22 09:42:01Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=69753 +pkgver=72253 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index b5981f918..9c81f9ef7 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71684 2012-06-01 13:04:52Z dreisner $ +# $Id: PKGBUILD 72760 2012-06-22 09:45:39Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: bluebugs pkgname=eeze-svn -pkgver=69825 -pkgrel=2 +pkgver=72008 +pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index fc81c5a3a..80e331e9d 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68742 2012-04-01 10:43:18Z rvanharen $ +# $Id: PKGBUILD 72769 2012-06-22 09:48:52Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=69816 +pkgver=72387 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 96ac83d5c..2cf580267 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68728 2012-04-01 10:37:35Z rvanharen $ +# $Id: PKGBUILD 72750 2012-06-22 09:41:17Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=69817 +pkgver=72252 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64') diff --git a/community/eio-svn/PKGBUILD b/community/eio-svn/PKGBUILD new file mode 100644 index 000000000..6992dc2aa --- /dev/null +++ b/community/eio-svn/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 72758 2012-06-22 09:44:59Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=eio-svn +pkgver=72607 +pkgrel=1 +pkgdesc="Async IO library" +arch=('i686' 'x86_64') +groups=('e17-libs-svn' 'e17-svn') +url="http://www.enlightenment.org" +license=('BSD') +depends=('ecore-svn') +makedepends=('subversion') +conflicts=('eio') +provides=('eio') +options=(!libtool) +source=() +md5sums=() + +_svntrunk="http://svn.enlightenment.org/svn/e/trunk/eio" +_svnmod="eio" + +build() { + cd $srcdir + +msg "Connecting to $_svntrunk SVN server...." + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + cp -r $_svnmod $_svnmod-build + cd $_svnmod-build + + ./autogen.sh --prefix=/usr + make +} + +package(){ + cd $_svnmod-build + make DESTDIR=$pkgdir install + + # install license files + install -Dm644 $srcdir/$_svnmod-build/COPYING \ + $pkgdir/usr/share/licenses/$pkgname/COPYING + + rm -r $srcdir/$_svnmod-build + +} diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index caed34649..007146064 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68749 2012-04-01 10:47:30Z rvanharen $ +# $Id: PKGBUILD 72775 2012-06-22 09:50:54Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=69796 +pkgver=72678 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 9a341972d..bd5d741a0 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68738 2012-04-01 10:41:49Z rvanharen $ +# $Id: PKGBUILD 72762 2012-06-22 09:46:18Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=69822 +pkgver=72112 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64') diff --git a/community/emotion-svn/PKGBUILD b/community/emotion-svn/PKGBUILD new file mode 100644 index 000000000..4f39fda91 --- /dev/null +++ b/community/emotion-svn/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 70361 2012-05-05 07:40:39Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=emotion-svn +pkgver=72440 +pkgrel=1 +pkgdesc="Library to easily integrate media playback into EFL applications" +arch=('i686' 'x86_64') +groups=('e17-libs-svn' 'e17-svn') +url="http://www.enlightenment.org" +license=('BSD') +depends=('gstreamer0.10' 'edje-svn' 'eeze-svn') +makedepends=('subversion') +conflicts=('emotion') +provides=('emotion') +options=(!libtool) +source=() +md5sums=() + +_svntrunk="http://svn.enlightenment.org/svn/e/trunk/emotion" +_svnmod="emotion" + +build() { + cd $srcdir + +msg "Connecting to $_svntrunk SVN server...." + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + cp -r $_svnmod $_svnmod-build + cd $_svnmod-build + + ./autogen.sh --prefix=/usr + make +} + +package(){ + cd $_svnmod-build + make DESTDIR=$pkgdir install + + # install license files + install -Dm644 $srcdir/$_svnmod-build/COPYING \ + $pkgdir/usr/share/licenses/$pkgname/COPYING + + rm -r $srcdir/$_svnmod-build + +} diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index 410868ce8..bfbf91875 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68747 2012-04-01 10:46:48Z rvanharen $ +# $Id: PKGBUILD 72773 2012-06-22 09:50:16Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/ethumb-svn/PKGBUILD b/community/ethumb-svn/PKGBUILD new file mode 100644 index 000000000..e8f8fb347 --- /dev/null +++ b/community/ethumb-svn/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 72767 2012-06-22 09:48:11Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=ethumb-svn +pkgver=72603 +pkgrel=1 +pkgdesc="Thumbnailing library" +arch=('i686' 'x86_64') +groups=('e17-libs-svn' 'e17-svn') +url="http://www.enlightenment.org" +license=('BSD') +depends=('libexif' 'e_dbus-svn' 'emotion-svn') +makedepends=('subversion') +conflicts=('ethumb') +provides=('ethumb') +options=(!libtool) +source=() +md5sums=() + +_svntrunk="http://svn.enlightenment.org/svn/e/trunk/ethumb" +_svnmod="ethumb" + +build() { + cd $srcdir + +msg "Connecting to $_svntrunk SVN server...." + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + cp -r $_svnmod $_svnmod-build + cd $_svnmod-build + + ./autogen.sh --prefix=/usr --libexecdir=/usr/lib + make +} + +package(){ + cd $_svnmod-build + make DESTDIR=$pkgdir install + + # install license files + install -Dm644 $srcdir/$_svnmod-build/COPYING \ + $pkgdir/usr/share/licenses/$pkgname/COPYING + + rm -r $srcdir/$_svnmod-build + +} diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index b46f942fc..ddcedd489 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68732 2012-04-01 10:39:10Z rvanharen $ +# $Id: PKGBUILD 72754 2012-06-22 09:42:43Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=69774 +pkgver=72604 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') @@ -39,7 +39,8 @@ msg "Connecting to $_svntrunk SVN server...." ./autogen.sh --prefix=/usr --enable-fb --enable-xrender-x11 \ --enable-gl-x11 --enable-fontconfig --enable-async-preload \ - --enable-async-events --enable-pipe-render --enable-async-render + --enable-async-events --enable-pipe-render --enable-async-render \ + --libexecdir=/usr/lib make } diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD new file mode 100644 index 000000000..f8309be89 --- /dev/null +++ b/community/evas_generic_loaders-svn/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 72755 2012-06-22 09:43:40Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Ronald van Haren <ronald.archlinux.org> + +pkgname=evas_generic_loaders-svn +pkgver=72171 +pkgrel=1 +pkgdesc="Additional generic loaders for Evas" +arch=('i686' 'x86_64') +groups=('e17-libs-svn' 'e17-svn') +url="http://www.enlightenment.org" +license=('BSD') +depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina-svn') +makedepends=('subversion') +conflicts=('evas_generic_loaders') +provides=('evas_generic_loaders') +options=('!libtool' '!emptydirs') +md5sums=() + +_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders" +_svnmod="evas_generic_loaders" + +build() { + cd "$srcdir" + +msg "Connecting to $_svntrunk SVN server...." + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + cp -r $_svnmod $_svnmod-build + cd $_svnmod-build + + ./autogen.sh --prefix=/usr + make +} + +package() { + cd "$srcdir/$_svnmod-build" + make DESTDIR="$pkgdir" install + +# install license files + install -Dm644 "$srcdir/$_svnmod-build/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + rm -r "$srcdir/$_svnmod-build" + +} diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index 2678ea80e..a4fc221fa 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71941 2012-06-03 21:58:45Z lfleischer $ +# $Id: PKGBUILD 72787 2012-06-22 12:50:29Z dreisner $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=exim pkgver=4.80 -pkgrel=1 +pkgrel=2 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686') url='http://www.exim.org/' @@ -21,13 +21,23 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2 exim exim.logrotate exim.conf.d - exim.Makefile) + exim.Makefile + exim-submission@.service + exim.service + exim@.service + exim.socket + exim-submission.socket) sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984' '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6' '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01' - '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55') + '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55' + '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324' + '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445' + '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4' + '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26' + 'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee') build() { cd "$srcdir/$pkgname-$pkgver" @@ -39,10 +49,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm0644 ../exim.logrotate "${pkgdir}/etc/logrotate.d/exim" - install -Dm0644 ../exim.conf.d "${pkgdir}/etc/conf.d/exim" + install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim" + install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim" install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8" - install -Dm0755 ../exim "${pkgdir}/etc/rc.d/exim" + install -Dm0755 $srcdir/exim "${pkgdir}/etc/rc.d/exim" mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \ "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,sbin} @@ -68,6 +78,11 @@ package() { # fhs compliancy ln -s ../sbin/exim ../lib/sendmail - mkdir -p "$pkgdir/etc/rc.d" - cp "$srcdir/exim" "$pkgdir/etc/rc.d" + install -Dm0644 "$srcdir/exim-submission@.service" \ + "${pkgdir}/usr/lib/systemd/system/exim-submission@.service" + install -Dm0644 "$srcdir/exim.service" "${pkgdir}/usr/lib/systemd/system/exim.service" + install -Dm0644 "$srcdir/exim@.service" "${pkgdir}/usr/lib/systemd/system/exim@.service" + install -Dm0644 "$srcdir/exim.socket" "${pkgdir}/usr/lib/systemd/system/exim.socket" + install -Dm0644 "$srcdir/exim-submission.socket" \ + "${pkgdir}/usr/lib/systemd/system/exim-submission.socket" } diff --git a/community/exim/exim-submission.socket b/community/exim/exim-submission.socket new file mode 100644 index 000000000..b9593e2ef --- /dev/null +++ b/community/exim/exim-submission.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Exim Mail Transfer Agent (message submission) +Conflicts=exim.service + +[Socket] +ListenStream=587 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/community/exim/exim-submission@.service b/community/exim/exim-submission@.service new file mode 100644 index 000000000..8b1d056a8 --- /dev/null +++ b/community/exim/exim-submission@.service @@ -0,0 +1,11 @@ +# It doesn't make sense for this to be separate from exim@.service +# However, I couldn't think of a way to have two .socket files point +# to it ([Socket] Service= is rejected if Accept=yes is set). + +[Unit] +Description=Exim Mail Daemon per-connection server (message submission) + +[Service] +ExecStart=-/usr/sbin/exim -bs +StandardInput=socket +StandardError=syslog diff --git a/community/exim/exim.service b/community/exim/exim.service new file mode 100644 index 000000000..de52fd14f --- /dev/null +++ b/community/exim/exim.service @@ -0,0 +1,10 @@ +[Unit] +Description=Exim Mail Daemon + +[Service] +PIDFile=/var/run/exim.pid +ExecStart=/usr/sbin/exim -bdf -q30m +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/community/exim/exim.socket b/community/exim/exim.socket new file mode 100644 index 000000000..36d28684f --- /dev/null +++ b/community/exim/exim.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Exim Mail Transfer Agent +Conflicts=exim.service + +[Socket] +ListenStream=25 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/community/exim/exim@.service b/community/exim/exim@.service new file mode 100644 index 000000000..120485b8b --- /dev/null +++ b/community/exim/exim@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Exim Mail Daemon per-connection server + +[Service] +ExecStart=-/usr/sbin/exim -bs +StandardInput=socket +StandardError=syslog diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 817ceef09..8aa35f054 100755 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72128 2012-06-08 23:36:39Z dreisner $ +# $Id: PKGBUILD 72788 2012-06-22 12:50:42Z dreisner $ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -6,7 +6,7 @@ pkgname=fcron pkgver=3.0.6 -pkgrel=6 +pkgrel=7 pkgdesc="feature-rich cron implementation" arch=(i686 x86_64) url="http://fcron.free.fr" @@ -20,12 +20,13 @@ backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \ var/spool/fcron/systab var/spool/fcron/systab.orig) options=('emptydirs' '!makeflags') source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \ - systab systab.orig run-cron) -md5sums=('ced7ca753517eac67502f3fec3908d39' + systab systab.orig run-cron fcron.service) +md5sums=('69ebcb41921e2a282f41ebecb3a27053' 'e0c3f0bdc3c98fbbe46eff19001c18f2' '938722c6654ef7b07f4aa10001905ba1' 'bfb7daa22ebe22b9917e455c1ca4a382' - '5ff0cdcb9ec99778938ac6ef26800327') + '5ff0cdcb9ec99778938ac6ef26800327' + 'ab589cc6813ec32b5e96bf05c2b51c4c') build() { cd "$srcdir/$pkgname-$pkgver" @@ -68,6 +69,10 @@ package() { # Install run-cron script to make fcron run without dcron install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron" + # Install systemd service + install -D -m644 "$srcdir/fcron.service" \ + "$pkgdir/usr/lib/systemd/system/fcron.service" + # avoid conflict with filesystem>=2012.06 rmdir "$pkgdir/var/run" } diff --git a/community/fcron/fcron.service b/community/fcron/fcron.service new file mode 100644 index 000000000..a47b4f19b --- /dev/null +++ b/community/fcron/fcron.service @@ -0,0 +1,10 @@ +[Unit] +Description=Cron Daemon + +[Service] +Type=forking +PIDFile=/run/fcron.pid +ExecStart=/usr/sbin/fcron + +[Install] +WantedBy=multi-user.target diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 1a9e48db5..9155fa2c6 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 72159 2012-06-09 08:34:59Z bpiotrowski $ +# $Id: PKGBUILD 72804 2012-06-22 13:10:36Z dreisner $ # Maintainer: Bartłomiej Piotrowski # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=11 -pkgdesc="Lightweight Display Manager (part of LXDE)" +pkgrel=12 +pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" license=('GPL') @@ -19,7 +19,7 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch lxdm-daemon lxdm-pam) + greeter-session.patch rc.d lxdm-pam service) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' 'a1e3c46a8bef691bc544028f5b6cfe22' 'baed9055e8825a5511712bc095197519' @@ -27,7 +27,8 @@ md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' 'd2e4a4a22ee2aa1a986be154c647b6c6' '28475239d0c8b4fd778ec49f5ec72962' '705f394052fdd0dec22e95321d170de0' - 'b20fe3c8487a039050986d60e45233a9') + 'b20fe3c8487a039050986d60e45233a9' + '4aaa9a7175cf327d9f7651c2586ef922') build() { cd $srcdir/$pkgname-$pkgver @@ -46,15 +47,16 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR=$pkgdir install - install -m644 ${srcdir}/lxdm-pam ${pkgdir}/etc/pam.d/lxdm - install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm - install -d ${pkgdir}/var/{lib,run}/lxdm + install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm + install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm + install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service + install -d $pkgdir/var/{lib,run}/lxdm # fix the greeter location - sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf + sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf # avoid conflict with filesystem>=2012.06 - rm -r "$pkgdir/var/run" + rm -r $pkgdir/var/run } diff --git a/community/lxdm/rc.d b/community/lxdm/rc.d new file mode 100644 index 000000000..68eb6225d --- /dev/null +++ b/community/lxdm/rc.d @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID `which lxdm-binary`) +case "$1" in + start) + stat_busy "Starting LXDM Display Manager" + [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lxdm + stat_done + fi + ;; + stop) + stat_busy "Stopping LXDM Display Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lxdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/lxdm/service b/community/lxdm/service new file mode 100644 index 000000000..b76e1190e --- /dev/null +++ b/community/lxdm/service @@ -0,0 +1,9 @@ +[Unit] +Description=LXDE Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/sbin/lxdm + +[Install] +WantedBy=graphical.target diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index 7e4715c96..e6a75b244 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,31 +1,39 @@ -# $Id: PKGBUILD 72149 2012-06-09 06:02:05Z spupykin $ +# $Id: PKGBUILD 72790 2012-06-22 12:50:59Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=2 pkgdesc="Teredo client and server." arch=('i686' 'x86_64') url="http://www.remlab.net/miredo/" license=('GPL') -depends=(judy iproute2) +depends=('judy' 'iproute2' 'libcap') backup=('etc/miredo/miredo.conf' 'etc/miredo/client-hook') -source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +options=('!libtool') +source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz isatapd.rc.d miredo.install miredo.rc.d - miredo-server.rc.d) -md5sums=('1281e7e75bddbde244cd778d99fa22d4' + miredo-server.rc.d + miredo.service) +md5sums=('5114debbf9fcab5d292176e4548f8cd1' '51ab6d091192605ee9206944869cb2ab' 'd1b655d7a851cdb46c91c3418ed1962f' 'c5a9be5c3175fecec387f1710bfd2788' - '319aba1ae06349b76cb25fda0dba60a9') + '319aba1ae06349b76cb25fda0dba60a9' + '3216d47d5aa979706b17b72d8b6e19b0') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-Judy + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --with-Judy make make DESTDIR="$pkgdir" install @@ -35,6 +43,7 @@ build() { sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" -} + rmdir "$pkgdir/var/run" "$pkgdir/var" + install -Dm644 "$srcdir/miredo.service" "$pkgdir/usr/lib/systemd/system/miredo.service" +} diff --git a/community/miredo/miredo.service b/community/miredo/miredo.service new file mode 100644 index 000000000..299a887de --- /dev/null +++ b/community/miredo/miredo.service @@ -0,0 +1,11 @@ +[Unit] +Description=Teredo IPv6 Tunneling Daemon +After=network.target + +[Service] +ExecStartPre=/usr/sbin/miredo-checkconf /etc/miredo/miredo.conf +ExecStart=/usr/sbin/miredo -f +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target
\ No newline at end of file diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 57a5d3dc9..733eaa629 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70656 2012-05-14 04:57:10Z svenstaro $ +# $Id: PKGBUILD 72741 2012-06-22 06:12:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Mathias Stearn <mathias@10gen.com> # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.conf' '0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch' '0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch') -md5sums=('06cf5fb887dbbddd70a29c0af08aad4f' +md5sums=('b3b32fecdcbe8e8068ec2989be9d2da4' '9c67e00f4626ad761a8f7d4e037a54d7' '4839fe1d638187ca3226e8267b947318' 'fdbf06b005b3a73a2b6caca257ec8f64' diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD index b2eed2962..18807fdf7 100644 --- a/community/oidentd/PKGBUILD +++ b/community/oidentd/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 64895 2012-02-18 19:49:45Z bpiotrowski $ -# Maintainer: simo <simo@archlinux.org> -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 72791 2012-06-22 12:51:10Z dreisner $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: simo <simo@archlinux.org> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=oidentd pkgver=2.0.8 -pkgrel=5 -pkgdesc="An ident (rfc1413 compliant) daemon that runs on Linux" +pkgrel=6 +pkgdesc='An RFC1413 compliant ident daemon' arch=('i686' 'x86_64') url="http://dev.ojnk.net/" license=('GPL') depends=('glibc' 'bash') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/oidentd-$pkgver.tar.gz - oidentd.rc - oidentd.default) +source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz + rc.d conf.d service socket) md5sums=('c3d9a56255819ef8904b867284386911' '93cbf742cdd0b053f67482273d715f25' - '603307525771724b0f55a2c34fbc3f3e') + '603307525771724b0f55a2c34fbc3f3e' + 'b215bee5764cdecb0939f44d5d2dccbe' + '651c2ef45d1d345d95056ef0787e29e6') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" - make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install - install -D -m 755 "$srcdir"/$pkgname.rc "$pkgdir"/etc/rc.d/oidentd - install -D -m 644 "$srcdir"/$pkgname.default "$pkgdir"/etc/conf.d/oidentd + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install + + install -D -m644 $srcdir/conf.d $pkgdir/etc/conf.d/oidentd + install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/oidentd + install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/oidentd@.service + install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket } diff --git a/community/oidentd/conf.d b/community/oidentd/conf.d new file mode 100644 index 000000000..5eefa80e2 --- /dev/null +++ b/community/oidentd/conf.d @@ -0,0 +1,5 @@ +USER=nobody +GROUP=nobody +OPTS="" +# You will need this, when you want oidentd listen both on IPv4 and IPv6 +# OPTS="-a ::" diff --git a/community/oidentd/rc.d b/community/oidentd/rc.d new file mode 100644 index 000000000..8b3c04c45 --- /dev/null +++ b/community/oidentd/rc.d @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/oidentd + +# no daemon check needed for oidentd, and no pid nesecary. +case "$1" in + start) + stat_busy "Starting oidentd Daemon..." + # oidentd is smart enough to only run one copy of + # itsself, no check nesecary, and no pidfile + /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon oidentd + stat_done + fi + ;; + stop) + stat_busy "Stopping oidentd Daemon..." + # kill the process by it's full name, or the init script + # will terminate as well, wreaking havok. + killall /usr/sbin/oidentd + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon oidentd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/oidentd/service b/community/oidentd/service new file mode 100644 index 000000000..3688298c1 --- /dev/null +++ b/community/oidentd/service @@ -0,0 +1,8 @@ +[Unit] +Description=Ident (RFC 1413) per-connection server + +[Service] +ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardError=syslog diff --git a/community/oidentd/socket b/community/oidentd/socket new file mode 100644 index 000000000..63df7036e --- /dev/null +++ b/community/oidentd/socket @@ -0,0 +1,10 @@ +[Unit] +Description=Ident (RFC 1413) socket +Conflicts=oidentd.service + +[Socket] +ListenStream=113 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index cceef84a2..48ccac808 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63447 2012-02-03 17:52:25Z bluewind $ +# $Id: PKGBUILD 72792 2012-06-22 12:51:25Z dreisner $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,7 +6,7 @@ pkgbase=oss pkgname=(oss libflashsupport-oss) pkgver=4.2_2006 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://developer.opensound.com/" license=('GPL2') @@ -16,12 +16,14 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_ "rc-script" "soundon.patch" "remove-hal.patch" + "oss.service" ) md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c' 'b9a380a0ac8896390d71ac13676f27e1' 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' - 'cd7f1dc6166bba8c94d96f3a28e948a5') + 'cd7f1dc6166bba8c94d96f3a28e948a5' + '8db0255b380dc6672993e627d1cd8ca6') _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl build() { @@ -74,16 +76,13 @@ package_oss() { backup=('usr/lib/oss/soundon.user') install=oss.install - cd "${srcdir}/${_dir}" - - msg "Copying files." - cd "${srcdir}/build/prototype" cp -a * "${pkgdir}" chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815) find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" + install -Dm644 "$srcdir/oss.service" "$pkgdir/usr/lib/systemd/system/oss.service" } package_libflashsupport-oss() { diff --git a/community/oss/oss.service b/community/oss/oss.service new file mode 100644 index 000000000..107c9bf3f --- /dev/null +++ b/community/oss/oss.service @@ -0,0 +1,12 @@ +[Unit] +Description=Open Sound System v4 +Before=sound.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/sbin/soundon +ExecStop=/usr/sbin/soundoff + +[Install] +WantedBy=multi-user.target diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index 70376661d..9a1f40211 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 67319 2012-03-08 16:32:05Z spupykin $ +# $Id: PKGBUILD 72793 2012-06-22 12:51:32Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrik Nymann Jensen <h@henriknj.dk> pkgname=pdnsd pkgver=1.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Is a proxy DNS server with permanent caching" arch=(i686 x86_64) -url="http://www.phys.uu.nl/~rombouts/pdnsd/" +url="http://members.home.nl/p.a.rombouts/pdnsd/" license=('GPL') depends=('glibc') #backup=('etc/pdnsd.conf') source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz - pdnsd) + pdnsd + pdnsd.service) md5sums=('037f79d191b98974ffc2c9649727bf66' - '3670bd47c9303fbb655d9216715512de') + '3670bd47c9303fbb655d9216715512de' + 'fad5e518d126b29fc947941d57a0a494') build() { cd $srcdir/$pkgname-$pkgver @@ -22,4 +24,5 @@ build() { make make DESTDIR=$pkgdir install install -Dm0755 $srcdir/pdnsd $pkgdir/etc/rc.d/pdnsd + install -Dm0644 $srcdir/pdnsd.service $pkgdir/usr/lib/systemd/system/pdnsd.service } diff --git a/community/pdnsd/pdnsd.service b/community/pdnsd/pdnsd.service new file mode 100644 index 000000000..5821dbcb2 --- /dev/null +++ b/community/pdnsd/pdnsd.service @@ -0,0 +1,9 @@ +[Unit] +Description=proxy name server +After=network.target + +[Service] +ExecStart=/usr/sbin/pdnsd + +[Install] +WantedBy=multi-user.target diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD new file mode 100644 index 000000000..e030c46f0 --- /dev/null +++ b/community/pianobar/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 72823 2012-06-22 22:35:27Z dwallace $ +# Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com> +# Contributor: Mitch Bigelow <ipha00@gmail.com> +# Contributor: Patrick Palka <patrick@parcs.ath.cx> + +pkgname=pianobar +pkgver=2012.05.06 +pkgrel=3 +pkgdesc="console-based frontend for Pandora" +url="http://6xq.net/0017" +arch=('i686' 'x86_64') +license=('MIT') +depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt') +source=(http://6xq.net/media/00/16/pianobar-$pkgver.tar.bz2) +sha256sums=('b143882ca50303d560f49567d1a508ca4b48208db4eb8aa67f369fcaae708d7a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="$pkgdir" PREFIX=/usr install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD index 5eaf8a991..e8749a5a4 100644 --- a/community/polipo/PKGBUILD +++ b/community/polipo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65625 2012-02-21 12:15:55Z ttopper $ +# $Id: PKGBUILD 72794 2012-06-22 12:51:45Z dreisner $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Thomas Holmquist <thomas@vorget.com> @@ -7,20 +7,21 @@ pkgname=polipo pkgver=1.0.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A small and fast caching web proxy." arch=('i686' 'x86_64') url="http://www.pps.jussieu.fr/~jch/software/polipo/" license=('GPL') depends=('bash') -makedepends=(texinfo) +makedepends=('texinfo') install=polipo.install -source=(http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz - polipo.cron polipo.rc.d) +source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz" + "polipo.cron" "polipo.rc.d" "polipo.conf.d" "polipo.service") md5sums=('bfc5c85289519658280e093a270d6703' 'bac0e1a871964c931eb5f7a369b3243c' - '443e442f7071e31dbd53fc9d810a2c3e') -conflicts=('polipo-git' 'polipo-darcs') + '8f096b7d77a71e0772ce71a8c8b1b3e3' + '685aa0c6070dee11c701932d23afcc6a' + '109d0e8c15d669281ff14f8991ad0ed8') build() { cd "$srcdir/$pkgname-$pkgver" @@ -48,6 +49,7 @@ package() { # install daemon scripts / cron install -Dm 755 $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo install -Dm 755 $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron + install -Dm 644 $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service } # vim:set ts=2 sw=2 et: diff --git a/community/polipo/polipo.conf.d b/community/polipo/polipo.conf.d new file mode 100644 index 000000000..dc879d32b --- /dev/null +++ b/community/polipo/polipo.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to polipo +# +POLIPO_ARGS="daemonise=true logFile=\"/var/log/polipo.log\"" diff --git a/community/polipo/polipo.install b/community/polipo/polipo.install index c3a4f82b9..bacc46377 100644 --- a/community/polipo/polipo.install +++ b/community/polipo/polipo.install @@ -6,9 +6,9 @@ post_install() { for file in ${filelist[@]}; do install-info $infodir/$file $infodir/dir 2> /dev/null done - - echo "You should create a config-file now, an example is located in /etc/polipo/." - echo "If you don't create a config-file, polipo will use its defaults." + install -d /var/cache/polipo 2> /dev/null + touch /var/log/polipo.log 2> /dev/null + chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null } post_upgrade() { diff --git a/community/polipo/polipo.rc.d b/community/polipo/polipo.rc.d index f9bbd4783..260fab050 100644 --- a/community/polipo/polipo.rc.d +++ b/community/polipo/polipo.rc.d @@ -1,60 +1,71 @@ #!/bin/bash + +daemon_name=polipo + . /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 /run/$daemon_name.pid ]] && + rm -f /run/$daemon_name.pid + # RUN + sudo -u nobody /usr/bin/$daemon_name ${POLIPO_ARGS} + # + if [[ $? -gt 0 ]]; then + stat_fail + exit 1 + else + echo $(get_pid) > /run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; -DAEMON=polipo -ARGS="daemonise=true pidFile=/var/run/$DAEMON/$DAEMON.pid" -PID=$(pidof -o %PPID /usr/bin/$DAEMON) - -case $1 in - start) - stat_busy "Starting $DAEMON" - if ck_daemon $DAEMON; then - [[ ! -d /var/run/$DAEMON ]] && install -d $DAEMON /var/run/$DAEMON - /usr/bin/$DAEMON $ARGS >/dev/null 2>&1 - if [[ $? != 0 ]]; then - stat_fail - else - add_daemon polipo - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping $DAEMON" - if ! ck_daemon $DAEMON; then - kill $PID >/dev/null 2>&1 - if [[ $? != 0 ]]; then - stat_fail - else - rm_daemon $DAEMON - stat_done - fi - else - stat_fail - fi - ;; - purge) - stat_busy "Purging $DAEMON" - [[ ! -d /var/run/$DAEMON ]] && install -d $DAEMON /var/run/$DAEMON - if ! ck_daemon $DAEMON; then - kill -USR1 $PID >/dev/null 2>&1 - sleep 1 - /usr/bin/$DAEMON -x $ARGS >/dev/null 2>&1 || stat_fail - kill -USR2 $PID >/dev/null 2>&1 - stat_done - else - /usr/bin/$DAEMON -x $ARGS >/dev/null 2>&1 || stat_fail - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart|purge}" - ;; + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [[ -n $PID ]] && kill $PID &> /dev/null + # + if [[ $? -gt 0 ]]; then + stat_fail + exit 1 + else + rm -f /run/$daemon_name.pid &> /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 + +# vim:set ts=2 sw=2 et: diff --git a/community/polipo/polipo.service b/community/polipo/polipo.service new file mode 100644 index 000000000..a1bdd9aa2 --- /dev/null +++ b/community/polipo/polipo.service @@ -0,0 +1,10 @@ +[Unit] +Description=Polipo Proxy Server + +[Service] +ExecStart=/usr/bin/polipo +User=nobody +ExecReload=/bin/kill -USR1 $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 1eb5bc5c2..77482ad20 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72148 2012-06-09 06:00:05Z spupykin $ +# $Id: PKGBUILD 72795 2012-06-22 12:52:02Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgname=prosody pkgver=0.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64') url="http://prosody.im/" @@ -21,12 +21,14 @@ source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz" 'prosody.rcd' 'prosody.logrotated' 'fix-config.patch' - 'prosody.tmpfile.d') + 'prosody.tmpfile.d' + 'prosody.service') md5sums=('6e907bf0d0acf24f1011083020ba6ffb' 'd2b5f9c8e42bb31819e715eb1756ee53' '26466fdbea87963a3ca6f48f76fe4a29' '59a1bf2dfd0bd386cef6fa646e2a3752' - 'e2f5a1df410b05696a30dcb058841084') + 'e2f5a1df410b05696a30dcb058841084' + 'e74045f27cb60908d535969906781f75') build() { cd "$srcdir/prosody-$pkgver" @@ -54,4 +56,5 @@ package() { install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf + install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service } diff --git a/community/prosody/prosody.service b/community/prosody/prosody.service index e69de29bb..f54159f55 100644 --- a/community/prosody/prosody.service +++ b/community/prosody/prosody.service @@ -0,0 +1,13 @@ +[Unit] +Description=XMPP (Jabber) Server +After=network.target + +[Service] +Type=forking +PIDFile=/run/prosody/prosody.pid +ExecStart=/usr/bin/prosodyctl start +ExecStop=/usr/bin/prosodyctl stop + +[Install] +WantedBy=multi-user.target + diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 12b8020cb..f970099cf 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71598 2012-05-30 16:07:48Z ttopper $ +# $Id: PKGBUILD 72814 2012-06-22 18:59:49Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.6.4 +pkgver=2.6.5 pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -sha1sums=('7438e6f11d3cd276acc6a54e606cfbb5abda762c') -md5sums=('ea40fcc8c3c40640ec000c39ac2c3746') +sha1sums=('1c0062abe7c133cf606f2f12013bad5a991b33a8') +md5sums=('c95d9a74f342573bce71a19b50d46832') build() { diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 714887f80..520256dff 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 64611 2012-02-17 02:54:22Z tdziedzic $ -# Maintiner: Alexander Rødseth <rodseth@gmail.com> +# $Id: PKGBUILD 72819 2012-06-22 21:24:20Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> + pkgname=ruby-cairo -pkgver=1.10.0 -pkgrel=3 +pkgver=1.12.2 +pkgrel=1 pkgdesc="Ruby bindings for cairo" -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') url="http://cairographics.org/rcairo/" license=('GPL') depends=('ruby' 'cairo>=1.2.0') makedepends=('ruby-pkgconfig') source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz") -sha256sums=('70e2df4fe0bcd2875d7512279058b116e964ca91d152cf9eb2f05b5c7774f118') +sha256sums=('f071d6ccb12cb6dc1fc91eb086d6150ce779930fe5af38a6987e378c809362c5') build() { cd "$srcdir/rcairo-$pkgver" diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD index d63b9450e..d1eb91627 100644 --- a/community/subtle/PKGBUILD +++ b/community/subtle/PKGBUILD @@ -1,28 +1,39 @@ -# $Id: PKGBUILD 66362 2012-02-24 01:53:44Z tdziedzic $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 72816 2012-06-22 21:15:04Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: unexist <unexist@dorfelite.net> -# Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com> +# Contributor: Abakus <java5@arcor.de> +# Contributor: TDY <tdy@gmx.com> +# Contributor: Xilon <xilonmu@gmail.com> + pkgname=subtle -pkgver=0.10.3008 -pkgrel=4 -pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel" +pkgver=0.11.3224 +pkgrel=1 +pkgdesc="Grid-based manual tiling window manager" arch=("i686" "x86_64") url="http://subtle.subforge.org" license=("GPL") -depends=("libx11" "ruby" "libxft" "libxpm" "libxrandr" "libxft" "libxpm" "libxinerama") -makedepends=("ruby" "pkg-config" "libxinerama" "libxrandr" "libxft" "libxpm") -provides=("subtle") -conflicts=("subtle-hg") +depends=("ruby" "libxft" "libxpm" "libxrandr" "libxft" "libxpm" "libxinerama" + "libxtst") +makedepends=("pkg-config" "libxinerama" "libxrandr" "libxft" "libxpm") backup=("etc/xdg/subtle/subtle.rb") install=subtle.install -source=(http://subforge.org/attachments/download/75/$pkgname-$pkgver-nu.tbz2) -md5sums=('10961e02f45a7ce9fc7ca5b11360f001') +source=("http://subforge.org/attachments/download/81/$pkgname-$pkgver-xi.tbz2") +sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2') build() { - cd "$srcdir/$pkgname-$pkgver-nu" + cd "$srcdir/$pkgname-$pkgver-xi" # use vendor_ruby instead of site_ruby - sed -e 's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' -i Rakefile + sed -e \ + 's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' \ + -i Rakefile +} + +package() { + cd "$srcdir/$pkgname-$pkgver-xi" rake destdir=$pkgdir install } + +# vim:set ts=2 sw=2 et: diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install index 363d963c5..cdb0d9469 100644 --- a/community/subtle/subtle.install +++ b/community/subtle/subtle.install @@ -1,11 +1,7 @@ post_upgrade() { - echo "ATTENTION:" - echo "This release of subtle (0.10.3008) includes awesome changes that might break your config, so please check http://subforge.org/projects/subtle and enjoy the new features" - echo "" - echo "In order to use sur you have to install the following dependencies: curb and minitar with" - echo "You can use this gem command: " - echo " gem install curb minitar" - echo "" - echo "If you have subtles on your system remember to upgrade them doing:" - echo " sur upgrade " + echo "In order to use sur you can install ruby-curb and ruby-minitar." + echo "If you have subtle on your system remember to upgrade with:" + echo " sur upgrade" } + +# vim:set ts=2 sw=2 et: diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 77ca33e7e..b167bf38d 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71511 2012-05-27 21:52:24Z lfleischer $ +# $Id: PKGBUILD 72796 2012-06-22 12:52:15Z dreisner $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.36 +pkgver=0.2.2.37 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64') @@ -19,12 +19,14 @@ install='tor.install' source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'torrc' 'tor' - 'tor.conf.d') -md5sums=('620b2110086aba01236b57f1d5aba416' - '0401cf01ad0bcc9aba4f9c1bb5e8e810' + 'tor.conf.d' + 'tor.service') +md5sums=('5aafdca4fb6af6e12b503d32b03f14a7' + '8d3adf70109d16e860dbf414f9d70eac' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' - '5c7c6834064b3530c442def6079ac3aa') + '5c7c6834064b3530c442def6079ac3aa' + 'cf23b97a1da09670214da6229a3ecb09') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -46,4 +48,6 @@ package() { install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor" install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + install -Dm0644 "${srcdir}/tor.service" "${pkgdir}/usr/lib/systemd/system/tor.service" } diff --git a/community/tor/tor.service b/community/tor/tor.service new file mode 100644 index 000000000..eb9b556b5 --- /dev/null +++ b/community/tor/tor.service @@ -0,0 +1,13 @@ +[Unit] +Description=Anonymizing Overlay Network + +[Service] +Type=forking +GuessMainPID=yes +EnvironmentFile=/etc/conf.d/tor +ExecStart=/usr/bin/tor -f $TOR_CONF $TOR_ARGS +ExecReload=/bin/kill -HUP $MAINPID +KillSignal=SIGINT + +[Install] +WantedBy=multi-user.target diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD index 3ec4f440a..12ae4bb73 100644 --- a/community/uptimed/PKGBUILD +++ b/community/uptimed/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72514 2012-06-16 08:04:35Z bpiotrowski $ +# $Id: PKGBUILD 72798 2012-06-22 12:52:28Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Tom Killian <tomk@runbox.com> @@ -6,7 +6,7 @@ pkgname=uptimed pkgver=0.3.17 -pkgrel=1 +pkgrel=2 pkgdesc="A system uptime record daemon" arch=(i686 x86_64) url="http://podgorny.cz/uptimed/" @@ -16,9 +16,11 @@ backup=(etc/uptimed.conf) options=('!libtool') install=$pkgname.install source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2 - rc.d) + rc.d + service) md5sums=('528b62c33454b33537c3bf2366977bdb' - '4ae90bee9fc78014a889a5072effb735') + '4ae90bee9fc78014a889a5072effb735' + '657102b06613ddb9811427bee1973c6b') build() { cd $srcdir/$pkgname-$pkgver @@ -41,5 +43,6 @@ package() { make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf - install -D $srcdir/rc.d $pkgdir/etc/rc.d/uptimed + install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/uptimed + install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/uptimed.service } diff --git a/community/uptimed/service b/community/uptimed/service new file mode 100644 index 000000000..2fd785318 --- /dev/null +++ b/community/uptimed/service @@ -0,0 +1,11 @@ +[Unit] +Description=System uptime record daemon + +[Service] +Type=forking +PIDFile=/var/run/uptimed +ExecStartPre=/usr/sbin/uptimed -b +ExecStart=/usr/sbin/uptimed + +[Install] +WantedBy=multi-user.target diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD index 310adf3a1..c6efc2d18 100644 --- a/community/vnstat/PKGBUILD +++ b/community/vnstat/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 55756 2011-09-19 06:41:29Z ttopper $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# $Id: PKGBUILD 72799 2012-06-22 12:52:33Z dreisner $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=vnstat pkgver=1.11 -pkgrel=2 +pkgrel=3 pkgdesc="A console-based network traffic monitor" arch=('i686' 'x86_64') url="http://humdi.net/vnstat/" @@ -14,19 +15,24 @@ makedepends=('gd') optdepends=('gd: image output') backup=(etc/vnstat.conf) source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz - http://humdi.net/vnstat/init.d/arch/vnstat) + http://humdi.net/vnstat/init.d/arch/vnstat + service) md5sums=('a5a113f9176cd61fb954f2ba297f5fdb' - 'e89a566dd7514ff0d2d3fc77b2d4ca7e') + 'e89a566dd7514ff0d2d3fc77b2d4ca7e' + 'fcc189e3dee616ff414dac72637c1a19') build() { - mkdir -p $pkgdir/etc - cd $srcdir/$pkgname-$pkgver - make all +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install install -D -m0755 $srcdir/vnstat $pkgdir/etc/rc.d/vnstat + install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service + install -D -m0644 examples/vnstat.cron $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron install -D -m0755 examples/vnstat.cgi $pkgdir/usr/share/doc/vnstat/examples/vnstat.cgi sed -i 's#root##' $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron diff --git a/community/vnstat/service b/community/vnstat/service new file mode 100644 index 000000000..f312351ea --- /dev/null +++ b/community/vnstat/service @@ -0,0 +1,9 @@ +[Unit] +Description=Network traffic monitor + +[Service] +ExecStart=/usr/sbin/vnstatd -n +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index 4903eb2c1..66c49e8b6 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69566 2012-04-18 17:36:30Z bpiotrowski $ +# $Id: PKGBUILD 72800 2012-06-22 12:52:54Z dreisner $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64') url="https://security.appspot.com/vsftpd.html" @@ -14,32 +14,46 @@ depends=('openssl') backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc} - 'vsftpd.xinetd' 'vsftpd.d') + vsftpd.xinetd vsftpd.d vsftpd-ssl.socket vsftpd.socket + vsftpd.service vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service) sha1sums=('436da30cefa33e22a0266077ab95397e9432e297' '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af' 'c87b4ce56dac15223694a6e86c01ea813b877596' - '24f268956c24e78be0c234c6d31f41487922eafe') + '24f268956c24e78be0c234c6d31f41487922eafe' + 'f81dab50243f7e82dc9722ca79b2b24de0882eb2' + '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba' + 'f1fa8cfaab1541c1ce3bb4dab4f4b302e5c44b03' + '3a040a18893a5103a1d4a22e631ee247bde8c8d3' + '08b2938dc81ee200b6d733a32f5565b9dbe170a3' + 'e5bd183664008bb0cc0353d4efb2e8e92a365798') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $srcdir/$pkgname-$pkgver # build-time config sed \ -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ -i builddefs.h - make CFLAGS="${CFLAGS} -fPIE" LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" + CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $srcdir/$pkgname-$pkgver - install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd" - install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf" - install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8" - install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5" - install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd" - install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd" + install -D -m755 vsftpd $pkgdir/usr/sbin/vsftpd + install -D -m644 vsftpd.conf $pkgdir/etc/vsftpd.conf + install -D -m644 vsftpd.8 $pkgdir/usr/share/man/man8/vsftpd.8 + install -D -m644 vsftpd.conf.5 $pkgdir/usr/share/man/man5/vsftpd.conf.5 + install -D -m644 $srcdir/vsftpd.xinetd $pkgdir/etc/xinetd.d/vsftpd + install -D -m755 $srcdir/vsftpd.d $pkgdir/etc/rc.d/vsftpd - install -d -m755 "${pkgdir}/usr/share/empty" + install -D -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service + install -D -m644 $srcdir/vsftpd@.service $pkgdir/usr/lib/systemd/system/vsftpd@.service + install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service + install -D -m644 $srcdir/vsftpd-ssl@.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl@.service + install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket + install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket + + install -d -m755 $pkgdir/usr/share/empty } diff --git a/community/vsftpd/vsftpd-ssl.service b/community/vsftpd/vsftpd-ssl.service new file mode 100644 index 000000000..f46b05fcd --- /dev/null +++ b/community/vsftpd/vsftpd-ssl.service @@ -0,0 +1,10 @@ +[Unit] +Description=vsftpd daemon (legacy implicit SSL) + +[Service] +ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes -oimplicit_ssl=yes +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/community/vsftpd/vsftpd-ssl.socket b/community/vsftpd/vsftpd-ssl.socket new file mode 100644 index 000000000..b18b639c1 --- /dev/null +++ b/community/vsftpd/vsftpd-ssl.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=vsftpd.service + +[Socket] +ListenStream=990 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/community/vsftpd/vsftpd-ssl@.service b/community/vsftpd/vsftpd-ssl@.service new file mode 100644 index 000000000..e53fad324 --- /dev/null +++ b/community/vsftpd/vsftpd-ssl@.service @@ -0,0 +1,9 @@ +[Unit] +Description=vsftpd per-connection server (legacy implicit SSL) + +[Service] +ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardOutput=socket +StandardError=syslog diff --git a/community/vsftpd/vsftpd.service b/community/vsftpd/vsftpd.service new file mode 100644 index 000000000..d4f7251ba --- /dev/null +++ b/community/vsftpd/vsftpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=vsftpd daemon + +[Service] +ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/community/vsftpd/vsftpd.socket b/community/vsftpd/vsftpd.socket new file mode 100644 index 000000000..cdc0d337e --- /dev/null +++ b/community/vsftpd/vsftpd.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=vsftpd.service + +[Socket] +ListenStream=21 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/community/vsftpd/vsftpd@.service b/community/vsftpd/vsftpd@.service new file mode 100644 index 000000000..353f95f82 --- /dev/null +++ b/community/vsftpd/vsftpd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=vsftpd per-connection server + +[Service] +ExecStart=-/usr/sbin/vsftpd +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardError=syslog diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD index 5469f3265..b5ce8787a 100644 --- a/community/zynaddsubfx/PKGBUILD +++ b/community/zynaddsubfx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69533 2012-04-17 22:54:21Z spupykin $ +# $Id: PKGBUILD 72810 2012-06-22 13:58:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: SpepS <dreamspepser at yahoo dot it> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=zynaddsubfx -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=1 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments." arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgv "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch" "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch" "$pkgname.svg") -md5sums=('4e1f15fd872f5cc649fc2217676e248e' +md5sums=('2e8994cc54e5f1a64b77dfac3baf0d9a' 'eb95d339ff5deac8c6b54965f04a8c60' '49464a33ab9c4250520eda0df7705663' '6f7e9c3ce3947088a10c99c46a65431f') @@ -56,8 +56,8 @@ package() { # banks and examples install -d "$pkgdir/usr/share/$pkgname" - cp -a ../banks "$pkgdir/usr/share/$pkgname" - cp -a ../examples "$pkgdir/usr/share/$pkgname" + cp -a ../instruments/banks "$pkgdir/usr/share/$pkgname" + cp -a ../instruments/examples "$pkgdir/usr/share/$pkgname" # desktop file and icon install -Dm644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg" diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index 795884823..65386def0 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -13,10 +13,12 @@ optdepends=('smtp-server: sending cron job output via email') source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' + 'service' 'pam.d' 'rc.d') sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3' '0f279b8fb820340267d578dc85511c980715f91e' + '3038a05476829f72fc4918bee9176b273ce10340' '5eff7fb31f6bc0a924243ff046704726cf20c221' 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') @@ -48,17 +50,19 @@ package() { make DESTDIR="${pkgdir}" install - install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} - install -d "${pkgdir}"/var/spool/{ana,}cron chmod u+s "${pkgdir}"/usr/bin/crontab + install -d "${pkgdir}"/var/spool/{ana,}cron + install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service + install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond + install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron - install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING } diff --git a/core/cronie/service b/core/cronie/service new file mode 100644 index 000000000..5ae193bfc --- /dev/null +++ b/core/cronie/service @@ -0,0 +1,10 @@ +[Unit] +Description=Periodic Command Scheduler + +[Service] +ExecStart=/usr/sbin/crond -n +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index e3496143f..39f3672be 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160390 2012-06-01 13:21:33Z dreisner $ +# $Id: PKGBUILD 162150 2012-06-22 12:53:50Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=5 +pkgrel=7 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -14,11 +14,15 @@ license=('GPL') source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 dmraid_install - dmraid_hook) + dmraid_hook + dmraid_tmpfiles + dmraid.service) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' '2297d23cee1aef23ec6ad8d6d1870356' - 'faec669dc85f87187b45b5d3968efe2c') + 'faec669dc85f87187b45b5d3968efe2c' + '56a8bb0ece8d206cd8efb504ee072ddd' + 'de0af1fdb9ed4c109b8119160167d2e9') build() { cd "$pkgname/1.0.0.rc16-3/$pkgname" @@ -29,11 +33,12 @@ 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 - mkdir -p "$pkgdir"/var/lock/dmraid - chmod 1777 "$pkgdir"/var/lock/ 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 + # fix permissions - chmod 644 "$pkgdir"/usr/lib/libdmraid.a - chmod 644 "$pkgdir"/usr/include/dmraid/* + chmod 644 "$pkgdir"/usr/include/dmraid/* "$pkgdir"/usr/lib/libdmraid.a + + install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service" } diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service new file mode 100644 index 000000000..1fd142ff2 --- /dev/null +++ b/core/dmraid/dmraid.service @@ -0,0 +1,16 @@ +[Unit] +Description=Assemble FakeRAID arrays +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +Before=basic.target shutdown.target +Conflicts=shutdown.target + +[Service] +ExecStart=/sbin/dmraid --ignorelocking --activate y -Z +Type=oneshot +TimeoutSec=0 +RemainAfterExit=true + +[Install] +WantedBy=basic.target diff --git a/core/dmraid/dmraid_tmpfiles b/core/dmraid/dmraid_tmpfiles new file mode 100644 index 000000000..4f21ac1fc --- /dev/null +++ b/core/dmraid/dmraid_tmpfiles @@ -0,0 +1 @@ +d /run/lock/dmraid 1777 root root diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index d9b1c4a78..50338486d 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161348 2012-06-10 05:52:29Z allan $ +# $Id: PKGBUILD 162151 2012-06-22 12:55:07Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=11 +pkgrel=12 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -50,7 +50,9 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.15-nearbyintf-rounding.patch glibc-2.15-confstr-local-buffer-extent.patch glibc-2.15-testsuite.patch - nscd + nscd.rcd + nscd.service + nscd.tmpfiles locale.gen.txt locale-gen) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' @@ -83,10 +85,13 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7ff501435078b1a2622124fbeaafc921' '8d1023a51e0932681b46440d5f8551ee' '6962c3fa29306bfbf6f0d22b19cb825d' - 'b587ee3a70c9b3713099295609afde49' + '589d79041aa767a5179eaa4e2737dd3f' + 'ad8a9af15ab7eeaa23dc7ee85024af9f' + 'bccbe5619e75cf1d97312ec3681c605c' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') + mksource() { git clone git://sourceware.org/git/glibc.git pushd glibc @@ -269,15 +274,17 @@ package() { rm -f ${pkgdir}/etc/ld.so.{cache,conf} - install -dm755 ${pkgdir}/etc/rc.d - install -dm755 ${pkgdir}/usr/sbin - install -dm755 ${pkgdir}/usr/lib/locale + install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}} + install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin + sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd + install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system + install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf + install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin # create /etc/locale.gen install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen diff --git a/core/glibc/nscd.rcd b/core/glibc/nscd.rcd new file mode 100755 index 000000000..4b48ab002 --- /dev/null +++ b/core/glibc/nscd.rcd @@ -0,0 +1,65 @@ +#!/bin/bash + +daemon_name="nscd" + +. /etc/rc.conf +. /etc/rc.d/functions + + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + PID=$(get_pid) + if [[ -z $PID ]]; then + rm -f /run/$daemon_name.pid + mkdir -p /run/nscd /var/db/nscd + rm -f /run/nscd/* /var/db/nscd/* + $daemon_name + if (( $? > 0 )); then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + [[ -n $PID ]] && nscd --shutdown &> /dev/null + if (( $? > 0 )); then + stat_fail + exit 1 + else + rm -f /run/$daemon_name.pid &> /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/core/glibc/nscd.service b/core/glibc/nscd.service new file mode 100644 index 000000000..de5315e9b --- /dev/null +++ b/core/glibc/nscd.service @@ -0,0 +1,17 @@ +[Unit] +Description=Name Service Cache Daemon +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/nscd +ExecStop=/usr/sbin/nscd --shutdown +ExecReload=/usr/sbin/nscd -i passwd +ExecReload=/usr/sbin/nscd -i group +ExecReload=/usr/sbin/nscd -i hosts +ExecReload=/usr/sbin/nscd -i service +Restart=always +PIDFile=/run/nscd/nscd.pid + +[Install] +WantedBy=multi-user.target diff --git a/core/glibc/nscd.tmpfiles b/core/glibc/nscd.tmpfiles new file mode 100644 index 000000000..8a24a785e --- /dev/null +++ b/core/glibc/nscd.tmpfiles @@ -0,0 +1 @@ +d /run/nscd 0755 root root diff --git a/core/iptables/0503-extension_cppflags.patch b/core/iptables/0503-extension_cppflags.patch new file mode 100644 index 000000000..0eb645731 --- /dev/null +++ b/core/iptables/0503-extension_cppflags.patch @@ -0,0 +1,13 @@ +Index: b/extensions/GNUmakefile.in +=================================================================== +--- a/extensions/GNUmakefile.in 2012-03-27 12:14:05.000000000 -0400 ++++ b/extensions/GNUmakefile.in 2012-03-27 16:03:48.378790221 -0400 +@@ -21,7 +21,7 @@ + kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ++AM_CPPFLAGS = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} + AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ + AM_LDFLAGS = @noundef_LDFLAGS@ + diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 42d5e009e..d2c859de4 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156635 2012-04-21 23:34:43Z allan $ +# $Id: PKGBUILD 162152 2012-06-22 12:55:41Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.13 -pkgrel=1 +pkgver=1.4.14 +pkgrel=2 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -22,9 +22,13 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-mangle.rules empty-nat.rules empty-raw.rules - empty-security.rules) + empty-security.rules + 0503-extension_cppflags.patch + iptables.service + ip6tables.service + iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('bf1f1896e052d1813a7c96fa70f88be8dab3ff86' +sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -34,25 +38,25 @@ sha1sums=('bf1f1896e052d1813a7c96fa70f88be8dab3ff86' 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' - 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') + 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' + '44626980a52e49f345a0b1e1ca03060f3a35763c' + '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' + 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' + 'e7abda09c61142121b6695928d3b71ccd8fdf73a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # http://bugs.archlinux.org/task/17046 - sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in - sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in - # use system one rm include/linux/types.h + patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch + ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ --enable-devel --enable-libipq \ - --enable-shared --enable-static -# build fails when not enabling static, see if we can remove it on next build -# 1.4.13 still fails + --enable-shared make } @@ -71,4 +75,10 @@ package() { mkdir -p "${pkgdir}"/var/lib/iptables install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables + + # install systemd files + install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service + install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service + install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush } + diff --git a/core/iptables/ip6tables.service b/core/iptables/ip6tables.service new file mode 100644 index 000000000..9a695f31e --- /dev/null +++ b/core/iptables/ip6tables.service @@ -0,0 +1,11 @@ +[Unit] +Description=IPv6 Packet Filtering Framework + +[Service] +Type=oneshot +ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules +ExecStop=/usr/lib/systemd/scripts/iptables-flush 6 +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/core/iptables/iptables-flush b/core/iptables/iptables-flush new file mode 100755 index 000000000..e6fafe950 --- /dev/null +++ b/core/iptables/iptables-flush @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Usage: iptables-flush [6] +# + +iptables=ip$1tables +if ! type -p "$iptables"; then + echo "error: invalid argument" + exit 1 +fi + +while read -r table; do + tables+=("/var/lib/$iptables/empty-$table.rules") +done <"/proc/net/ip$1_tables_names" + +if (( ${#tables[*]} )); then + cat "${tables[@]}" | "$iptables-restore" +fi diff --git a/core/iptables/iptables.service b/core/iptables/iptables.service new file mode 100644 index 000000000..3084f53b7 --- /dev/null +++ b/core/iptables/iptables.service @@ -0,0 +1,11 @@ +[Unit] +Description=Packet Filtering Framework + +[Service] +Type=oneshot +ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules +ExecStop=/usr/lib/systemd/scripts/iptables-flush +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 0521b887a..7452e062d 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160944 2012-06-07 11:57:54Z stephane $ +# $Id: PKGBUILD 162178 2012-06-22 17:24:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -14,13 +14,23 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar krb5-1.10.1-gcc47.patch krb5-kadmind + krb5-kadmind.service krb5-kdc - krb5-kpropd) + krb5-kdc.service + krb5-kpropd + krb5-kpropd.service + krb5-kpropd@.service + krb5-kpropd.socket) sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' '78b759d566b1fdefd9bbcd06df14f07f12effe96' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '7f402078fa65bb9ff1beb6cbbbb017450df78560') + 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '614401dd4ac18e310153240bb26eb32ff1e8cf5b' + '023a8164f8ee7066ac814486a68bc605e79f6101' + 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') options=('!emptydirs') build() { @@ -74,4 +84,9 @@ package() { install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # systemd stuff + install -dm 755 "${pkgdir}"/usr/lib/systemd/system + install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \ + "${pkgdir}"/usr/lib/systemd/system } diff --git a/core/krb5/krb5-kadmind.service b/core/krb5/krb5-kadmind.service new file mode 100644 index 000000000..f3836c898 --- /dev/null +++ b/core/krb5/krb5-kadmind.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 administration server + +[Service] +ExecStart=/usr/sbin/kadmind -nofork + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kdc.service b/core/krb5/krb5-kdc.service new file mode 100644 index 000000000..6ec93bb72 --- /dev/null +++ b/core/krb5/krb5-kdc.service @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 KDC + +[Service] +ExecStart=/usr/sbin/krb5kdc -n +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kpropd.service b/core/krb5/krb5-kpropd.service new file mode 100644 index 000000000..a7c5b579d --- /dev/null +++ b/core/krb5/krb5-kpropd.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Service] +ExecStart=/usr/sbin/kpropd -S + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kpropd.socket b/core/krb5/krb5-kpropd.socket new file mode 100644 index 000000000..4389290c0 --- /dev/null +++ b/core/krb5/krb5-kpropd.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Socket] +ListenStream=754 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/core/krb5/krb5-kpropd@.service b/core/krb5/krb5-kpropd@.service new file mode 100644 index 000000000..46f7e3639 --- /dev/null +++ b/core/krb5/krb5-kpropd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server +Conflicts=krb5-kpropd.service + +[Service] +ExecStart=/usr/sbin/kpropd +StandardInput=socket +StandardError=syslog diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 9cbb8bcf3..ed0587484 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160347 2012-06-01 12:56:44Z dreisner $ +# $Id: PKGBUILD 162154 2012-06-22 12:56:20Z dreisner $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.95 -pkgrel=6 +pkgver=2.02.96 +pkgrel=2 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -13,26 +13,25 @@ groups=('base') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install lvm2_hook - 11-dm-initramfs.rules) -sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' - '45f5e31045065e7bdf5d6f2e21c857b4978024b4' + 11-dm-initramfs.rules + lvm.service + lvm2.conf) +sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f' + '12e9016485c415c344524e6e75e23dfa6ca097ac' '3e1680f9b76ce9150d08865d99db90fd15532271' 'cedc9948123c870f9c5aa3357d0075b41a9c8135' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') + 'f6a554eea9557c3c236df2943bb6e7e723945c41' + '17df8689630a77e46899a8bd56997d9db896d5af' + 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - # libudev.so.1.0.0 compat - sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \ - tools/dmsetup.c \ - lib/misc/lvm-wrappers.c - - ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --enable-udev_sync --enable-udev_rules + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \ + --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules make } @@ -63,4 +62,7 @@ package_lvm2() { # mkinitcpio hook install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" + # systemd support + install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service" + install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf" } diff --git a/core/lvm2/lvm.service b/core/lvm2/lvm.service new file mode 100644 index 000000000..277d5a773 --- /dev/null +++ b/core/lvm2/lvm.service @@ -0,0 +1,16 @@ +[Unit] +Description=LVM activation +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +Before=basic.target 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/core/lvm2/lvm2.conf b/core/lvm2/lvm2.conf new file mode 100644 index 000000000..129824552 --- /dev/null +++ b/core/lvm2/lvm2.conf @@ -0,0 +1,2 @@ +d /run/lock/lvm 0755 root root - +d /run/lvm 0755 root root - diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index f084b2ea5..3ac2cfefc 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 160638 2012-06-02 22:26:01Z allan $ +# $Id: PKGBUILD 162155 2012-06-22 12:56:36Z dreisner $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.31 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default + slapd slapd.default slapd.service ntlm.patch mutex-end-of-struct-sigsegv.patch) sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' 'd89b8a533045123f1ab46c9c430cf132d58a20a4' + 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' '694269dad78c7a806649c2d7f57bb7e503df3af1') @@ -98,5 +99,6 @@ package_openldap() { install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/openldap/slapd.service b/core/openldap/slapd.service new file mode 100644 index 000000000..d8baa57b5 --- /dev/null +++ b/core/openldap/slapd.service @@ -0,0 +1,9 @@ +[Unit] +Description=OpenLDAP server daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/slapd + +[Install] +WantedBy=multi-user.target diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 66fb4603c..02fef6c1f 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,27 +1,38 @@ -# $Id: PKGBUILD 157930 2012-04-30 06:17:08Z bisson $ +# $Id: PKGBUILD 162156 2012-06-22 12:56:57Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.0p1 -pkgrel=2 +pkgrel=3 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') arch=('i686' 'x86_64') depends=('krb5' 'openssl' 'libedit' 'ldns') -optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') +optdepends=('xorg-xauth: X11 forwarding' + 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'sshd.close-sessions' + 'sshdgenkeys.service' + 'sshd@.service' + 'sshd.service' + 'sshd.socket' + 'tmpfiles.d' 'sshd.confd' 'sshd.pam' 'sshd') sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' + '6c71de2c2ca9622aa8e863acd94b135555e11125' + 'bd6eae36c7ef9efb7147778baad7858b81f2d660' + '83a257b8f6a62237383262cb0e2583e5609ddac0' + 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' + 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '659e3ee95c269014783ff8b318c6f50bf7496fbd' - '21fa88de6cc1c7912e71655f50896ba17991a1c2') + 'ed36e3a522f619ff6b13e253526596e4cca11e9f') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') @@ -41,6 +52,7 @@ build() { --with-xauth=/usr/bin/xauth \ --with-mantype=man \ --with-md5-passwords \ + --with-pid-dir=/run \ make } @@ -57,15 +69,22 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - rm "${pkgdir}"/usr/share/man/man1/slogin.1 ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service + install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service + install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service + install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf + + install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 diff --git a/core/openssh/sshd b/core/openssh/sshd index 1d68fb877..4bf4780f5 100755 --- a/core/openssh/sshd +++ b/core/openssh/sshd @@ -4,7 +4,7 @@ . /etc/rc.d/functions . /etc/conf.d/sshd -PIDFILE=/var/run/sshd.pid +PIDFILE=/run/sshd.pid PID=$(cat $PIDFILE 2>/dev/null) if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then PID= diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service new file mode 100644 index 000000000..7c8f88372 --- /dev/null +++ b/core/openssh/sshd.service @@ -0,0 +1,19 @@ +[Unit] +Description=OpenSSH Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=/usr/sbin/sshd -D +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=always + +[Install] +WantedBy=multi-user.target +Also=sshdgenkeys.service + +# Note that this is the service file for running a single SSH server for all +# incoming connections, suitable only for systems with a large amount of SSH +# traffic. In almost all other cases it is a better idea to use sshd.socket + +# sshd@.service (i.e. the on-demand spawning version for one instance per +# connection). diff --git a/core/openssh/sshd.socket b/core/openssh/sshd.socket new file mode 100644 index 000000000..6a67bfe86 --- /dev/null +++ b/core/openssh/sshd.socket @@ -0,0 +1,10 @@ +[Unit] +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=sshdgenkeys.service diff --git a/core/openssh/sshdgenkeys.service b/core/openssh/sshdgenkeys.service new file mode 100644 index 000000000..47c1c3fd6 --- /dev/null +++ b/core/openssh/sshdgenkeys.service @@ -0,0 +1,18 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_key +ConditionPathExists=|!/etc/ssh/ssh_host_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/core/openssh/tmpfiles.d b/core/openssh/tmpfiles.d new file mode 100644 index 000000000..7c5b26100 --- /dev/null +++ b/core/openssh/tmpfiles.d @@ -0,0 +1 @@ +d /var/empty 0755 root root - diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index 62edcf962..6a964a35c 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') 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 05c4fe8d8..30803aa5f 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 1f9c4ccf4..7f8c9b65b 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154496 2012-03-29 15:43:20Z bisson $ +# $Id: PKGBUILD 162158 2012-06-22 12:58:24Z dreisner $ # 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 -pkgrel=2 +pkgver=0.97.5 +pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') @@ -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,13 @@ 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" - - # Un-distribute databases to require freshclam. - rm "${pkgdir}"/var/lib/clamav/*.cvd + 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 } 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 0bff642b8..c90dd5608 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') @@ -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 e2463836e..2d85f9060 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') 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 23eff69f3..3da7795da 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 f42a0ee01..951a64b0f 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') 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/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 158ee6bd1..9c330fefc 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') -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 46b3c23cd..9bc98ab71 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') 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/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index 8cf4b6960..2ad93660d 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') 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 352078fe3..d4ce1b4d9 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') 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 diff --git a/libre-testing/icewm-themes-libre/PKGBUILD b/libre-testing/icewm-themes-libre/PKGBUILD new file mode 100644 index 000000000..a6cb0a6ba --- /dev/null +++ b/libre-testing/icewm-themes-libre/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 65600 2012-02-21 09:25:34Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> +# Maintainer (Parabola): Ben Peterson <mulenmar@yahoo.com> + +pkgname=icewm-themes-libre +_pkgname=icewm-themes +pkgver=1.2.26 +pkgrel=4 +pkgdesc="Themes for Ice Window Manager. (no trademarked themes)" +arch=('any') +license=("GPLv2") +url=http://www.debian.org +depends=(icewm) +source=(http://ftp.debian.org/debian/pool/main/i/icewm-themes/icewm-themes_$pkgver.orig.tar.gz) +md5sums=('c0fd0de59e6f74c9c86c0bc334eb6b9e') +replaces=('icewm-themes') + + +build() { + cd $srcdir/$_pkgname-$pkgver + mkdir -p $pkgdir/usr/share/icewm/themes + cp -r $srcdir/$_pkgname-$pkgver/* $pkgdir/usr/share/icewm/themes/ + + # Remove themes with Microsoft® Windows® trademarks + rm $pkgdir/usr/share/icewm/themes/fake95 -rf + rm $pkgdir/usr/share/icewm/themes/GlamICE -rf + + # Remove themes with Apple® trademarks (changing capitalizations doesn't make + # it free) + rm $pkgdir/usr/share/icewm/themes/liQuid -rf + rm $pkgdir/usr/share/icewm/themes/sortofaqua -rf + rm $pkgdir/usr/share/icewm/themes/aquablue -rf + rm $pkgdir/usr/share/icewm/themes/jim-mac -rf + + # Remove themes with other trademarks + rm $pkgdir/usr/share/icewm/themes/slashdot -rf + rm $pkgdir/usr/share/icewm/themes/Slashdot -rf + rm $pkgdir/usr/share/icewm/themes/yamm -rf + + # Remove themes with copyright violations + rm $pkgdir/usr/share/icewm/themes/Urbicande -rf + + + find $pkgdir -type d -exec chmod 755 {} \; + find $pkgdir -type f -exec chmod 644 {} \; +} diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 3c9b2a8cc..7b228cef3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver pkgrel=1 @@ -32,10 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - '3.4.2-rpc_pipefs.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '0187759260fd998fc2130e069df5b054' + 'e9bb311ab329555a61696b1a18df2d34' '669c3f9d5c6a2109bad8e511287826c3' '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -44,8 +43,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '5a7baeab35f968bf9a6ab115d14586c7' - '972b3b460764780ee48f031a043a9c09') + 'f959f197166bf56c19fc09e79a1bf1d3') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -62,8 +60,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix nfs4 regression - patch -Np1 -i "${srcdir}/3.4.2-rpc_pipefs.patch" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index b70fd9663..ba766d0c7 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.3-1-LIBRE +KERNEL_VERSION=3.4.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..766dcb87f --- /dev/null +++ b/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch @@ -0,0 +1,124 @@ +From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 25 May 2012 19:43:24 -0400 +Subject: [PATCH] Reinstate TIMEOUT= handling + +This is mostly to deal with ipw2?00 drivers which have yet to be fixed +in the kernel. +--- + src/libudev/libudev-device.c | 19 +++++++++++++++++++ + src/libudev/libudev-private.h | 1 + + src/udev/udevd.c | 13 ++++++++++--- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index a8277d1..5966189 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -89,6 +90,21 @@ struct udev_device { + bool db_persist; + }; + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + /** + * udev_device_get_seqnum: + * @udev_device: udev device +@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + + util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL); + udev_device_set_syspath(udev_device, path); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (startswith(property, "SUBSYSTEM=")) { + udev_device_set_subsystem(udev_device, &property[10]); + } else if (startswith(property, "DEVTYPE=")) { +@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h +index 4eb4a59..99aefeb 100644 +--- a/src/libudev/libudev-private.h ++++ b/src/libudev/libudev-private.h +@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 0d85960..cd24462 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -384,7 +384,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -410,7 +410,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + log_debug("maximum number (%i) of children reached\n", children); + return; +@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev) + if (is_devpath_busy(event)) + continue; + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.10.2 + diff --git a/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch b/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch new file mode 100644 index 000000000..117b0df57 --- /dev/null +++ b/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch @@ -0,0 +1,26 @@ +From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Wed, 6 Jun 2012 14:30:16 +0200 +Subject: [PATCH] udev: systemd-udev-settle.service fix After= + +https://bugs.freedesktop.org/show_bug.cgi?id=50779 +--- + units/systemd-udev-settle.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in +index d637700..2c4c129 100644 +--- a/units/systemd-udev-settle.service.in ++++ b/units/systemd-udev-settle.service.in +@@ -21,7 +21,7 @@ Documentation=man:udev(7) + Documentation=man:systemd-udevd(8) + DefaultDependencies=no + Wants=systemd-udev.service +-After=udev-trigger.service ++After=systemd-udev-trigger.service + Before=basic.target + ConditionCapability=CAP_MKNOD + +-- +1.7.11 + diff --git a/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch b/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch new file mode 100644 index 000000000..a2cdf64a7 --- /dev/null +++ b/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch @@ -0,0 +1,79 @@ +From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sun, 10 Jun 2012 20:37:14 +0200 +Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rather than assuming the console is in utf-8 mode if nothing else is +specified, be a bit more robust and enable it explicitly. + +This fixes a regression compared with Arch's initscripts when not +using a framebuffer as the old VGA console would not be in utf-8 +mode by default. + +Furthermore, this would allow vconsole-setup to be used after boot +to change the vconsole into utf-8 mode in case it has been set to +non-utf-8 mode for whatever reason. I.e, the following would leave +the console in utf-8 mode as expected: + + # export LANG=en_US.ISO-8859-1 + # /usr/lib/systemd/systemd-vconsole-setup + # export LANG=en_US.UTF-8 + # /usr/lib/systemd/systemd-vconsole-setup + +Reported-by: Xyne <xyne@archlinx.ca> +Reported-by: Thomas Bächler <thomas@archlinux.org> +Cc: Dave Reisner <dreisner@archlinux.org> +--- + src/vconsole/vconsole-setup.c | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c +index d04fab4..aa5fa18 100644 +--- a/src/vconsole/vconsole-setup.c ++++ b/src/vconsole/vconsole-setup.c +@@ -80,6 +80,25 @@ static int disable_utf8(int fd) { + return r; + } + ++static int enable_utf8(int fd) { ++ int r = 0, k; ++ ++ if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0) ++ r = -errno; ++ ++ if (loop_write(fd, "\033%G", 3, false) < 0) ++ r = -errno; ++ ++ k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1"); ++ if (k < 0) ++ r = k; ++ ++ if (r < 0) ++ log_warning("Failed to enable UTF-8: %s", strerror(-r)); ++ ++ return r; ++} ++ + static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) { + const char *args[8]; + int i = 0; +@@ -418,9 +437,12 @@ int main(int argc, char **argv) { + + r = EXIT_FAILURE; + +- if (!utf8) ++ if (utf8) ++ enable_utf8(fd); ++ else + disable_utf8(fd); + ++ + if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 && + load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) + r = EXIT_SUCCESS; +-- +1.7.11 + diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD new file mode 100644 index 000000000..367b26834 --- /dev/null +++ b/testing/systemd/PKGBUILD @@ -0,0 +1,214 @@ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> + +pkgbase=systemd +pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') +pkgver=185 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2' 'LGPL2.1' 'MIT') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz') +options=('!libtool') +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + 'initcpio-hook-udev' + 'initcpio-install-udev' + 'initcpio-install-timestamp' + '0001-Reinstate-TIMEOUT-handling.patch' + '0001-vconsole-setup-enable-utf-8-mode-explicitly.patch' + '0001-udev-systemd-udev-settle.service-fix-After.patch' + 'locale.sh') +md5sums=('a7dbbf05986eb0d2c164ec8e570eb78f' + 'e99e9189aa2f6084ac28b8ddf605aeb8' + '59e91c4d7a69b7bf12c86a9982e37ced' + 'df69615503ad293c9ddf9d8b7755282d' + '5543be25f205f853a21fa5ee68e03f0d' + '83f51149ff9c4d75ea946e2b3cc61e53' + 'b3e41e90beaff35c66ba1b4bc223430a' + 'f15956945052bb911e5df81cf5e7e5dc') + +build() { + cd "$pkgname-$pkgver" + + # still waiting on ipw2x00 to get fixed... + patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + + # upstream commit d305a67b46644d6360ef557109384c831ee8e018 + patch -Np1 <"$srcdir/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch" + + # upstream commit 8e8eb8fbafcaa841fa5393e396acde27b26edf2f + patch -Np1 <"$srcdir/0001-udev-systemd-udev-settle.service-fix-After.patch" + + ./configure \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --enable-split-usr \ + --enable-introspection \ + --enable-gtk-doc \ + --disable-audit \ + --disable-ima \ + --with-pamlibdir=/usr/lib/security \ + --with-distro=arch \ + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids \ + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + + make +} + +package_systemd() { + pkgdesc="system and service manager" + depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' + "systemd-tools=$pkgver" 'util-linux' 'xz') + optdepends=('python2-dbus: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/logind.conf + etc/systemd/journald.conf) + install="systemd.install" + + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + install -dm755 "$pkgdir/bin" + ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + + # fix systemd-analyze for python2 + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # move bash-completion and symlink for loginctl + install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ + "$pkgdir/usr/share/bash-completion/completions/systemctl" + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + rm -rf "$pkgdir/etc/bash_completion.d" + + # don't write units to /etc by default -- we'll enable this on post_install + # as a sane default + rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" + rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + + ### split off libsystemd (libs, includes, pkgconfig, man3) + rm -rf "$srcdir/_libsystemd" + install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} + cd "$srcdir"/_libsystemd + mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib + mv "$pkgdir/usr/include/systemd" usr/include + mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 + + ### split out systemd-tools/udev + rm -rf "$srcdir/_tools" + install -dm755 \ + "$srcdir"/_tools/etc/udev \ + "$srcdir"/_tools/usr/bin \ + "$srcdir"/_tools/usr/include \ + "$srcdir"/_tools/usr/lib/udev \ + "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ + "$srcdir"/_tools/usr/lib/girepository-1.0 \ + "$srcdir"/_tools/usr/share/pkgconfig \ + "$srcdir"/_tools/usr/share/gir-1.0 \ + "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \ + "$srcdir"/_tools/usr/share/man/man{1,5,7,8} + + cd "$srcdir/_tools" + mv "$pkgdir"/etc/udev etc + mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc + mv "$pkgdir"/usr/bin/udevadm usr/bin + mv "$pkgdir"/usr/lib/pkgconfig usr/lib + mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd + mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system + mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants + mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants + mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib + mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib + mv "$pkgdir"/usr/lib/udev usr/lib + mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include + mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib + mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig + mv "$pkgdir"/usr/share/gir-1.0 usr/share + mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html + mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7 + mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8 + mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1 + mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 + mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5 + mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin + mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit' 'initscripts') + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" + + install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('xz') + + mv "$srcdir/_libsystemd"/* "$pkgdir" +} + +package_systemd-tools() { + pkgdesc='standalone tools from systemd' + url='http://www.freedesktop.org/wiki/Software/systemd' + depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd') + optdepends=('cryptsetup: required for encrypted block devices') + provides=("udev=$pkgver") + conflicts=('udev') + replaces=('udev') + install='systemd-tools.install' + + mv "$srcdir/_tools/"* "$pkgdir" + + # the path to udevadm is hardcoded in some places + install -d "$pkgdir/sbin" + ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" + + # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? + ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + sed -i 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + + # add mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" + install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" + install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" + + # XXX: kill off coredump rule until the journal can recover coredumps + # this file needs to come back as part of systemd, not systemd-tools + rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" +} + +# vim: ft=sh syn=sh et diff --git a/testing/systemd/initcpio-hook-udev b/testing/systemd/initcpio-hook-udev new file mode 100644 index 000000000..75da7e4a8 --- /dev/null +++ b/testing/systemd/initcpio-hook-udev @@ -0,0 +1,20 @@ +#!/usr/bin/ash + +run_earlyhook() { + udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +} + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/systemd/initcpio-install-timestamp b/testing/systemd/initcpio-install-timestamp new file mode 100644 index 000000000..259cc705b --- /dev/null +++ b/testing/systemd/initcpio-install-timestamp @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp +} + +help() { + cat <<HELPEOF +Provides support for RD_TIMESTAMP in early userspace, which can be read by a +program such as systemd-analyze to determine boot time. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/systemd/initcpio-install-udev b/testing/systemd/initcpio-install-udev new file mode 100644 index 000000000..762429983 --- /dev/null +++ b/testing/systemd/initcpio-install-udev @@ -0,0 +1,28 @@ +#!/bin/bash + +build() { + local rules tool + + add_file "/etc/udev/udev.conf" + add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + + add_runscript +} + +help() { + cat <<HELPEOF +This hook will use udev to create your root device node and detect the needed +modules for your root device. It is also required for firmware loading in +initramfs. It is recommended to use this hook. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/systemd/locale.sh b/testing/systemd/locale.sh new file mode 100644 index 000000000..a4c413eed --- /dev/null +++ b/testing/systemd/locale.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +if [ ! -r /etc/locale.conf ]; then + return +fi + +. /etc/locale.conf + +if [ "${LANG+x}" = 'x' ]; then + export LANG +fi + +if [ "${LC_CTYPE+x}" = 'x' ]; then + export LC_CTYPE +fi + +if [ "${LC_NUMERIC+x}" = 'x' ]; then + export LC_NUMERIC +fi + +if [ "${LC_TIME+x}" = 'x' ]; then + export LC_TIME +fi + +if [ "${LC_COLLATE+x}" = 'x' ]; then + export LC_COLLATE +fi + +if [ "${LC_MONETARY+x}" = 'x' ]; then + export LC_MONETARY +fi + +if [ "${LC_MESSAGES+x}" = 'x' ]; then + export LC_MESSAGES +fi + +if [ "${LC_PAPER+x}" = 'x' ]; then + export LC_PAPER +fi + +if [ "${LC_NAME+x}" = 'x' ]; then + export LC_NAME +fi + +if [ "${LC_ADDRESS+x}" = 'x' ]; then + export LC_ADDRESS +fi + +if [ "${LC_TELEPHONE+x}" = 'x' ]; then + export LC_TELEPHONE +fi + +if [ "${LC_MEASUREMENT+x}" = 'x' ]; then + export LC_MEASUREMENT +fi + +if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then + export LC_IDENTIFICATION +fi + diff --git a/testing/systemd/systemd-tools.install b/testing/systemd/systemd-tools.install new file mode 100644 index 000000000..c1c19d15d --- /dev/null +++ b/testing/systemd/systemd-tools.install @@ -0,0 +1,29 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 174)" -lt 0 ]; then + echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo " 'scanner' and 'video' groups. Beware of any changes." + echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." + echo " * For security reasons, we no longer add devices to the 'storage' group. Use" + echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo " this functionality back." + echo " * We no longer create the static nodes on install needed for an initrd-less" + echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" + echo " installs." + fi + if [ "$(vercmp $2 175)" -lt 0 ]; then + echo " * devtmpfs support is now a hard requirement. Users of the official Arch" + echo " kernels have this enabled." + fi + if [ "$(vercmp $2 181)" -lt 0 ]; then + echo " * udev-compat has been removed, and should be uninstalled." + echo " * Framebuffers are no longer blacklisted by default." + echo " * binaries moved from /sbin to /usr/bin" + fi + if [ "$(vercmp $2 181-3)" -lt 0 ]; then + echo " * if your kernel does not provide /dev/loop-control, you need to manually" + echo " load the 'loop' module before using losetup" + fi +} diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install new file mode 100644 index 000000000..cb82b6c8c --- /dev/null +++ b/testing/systemd/systemd.install @@ -0,0 +1,41 @@ +#!/bin/sh + +sd_booted() { + [ -e sys/fs/cgroup/systemd ] +} + +post_install() { + systemd-machine-id-setup + + # enable getty@tty1 by default, but don't track the file + systemctl enable getty@.service + + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd" +} + +post_upgrade() { + systemd-machine-id-setup + + if sd_booted; then + # we moved the binary in 44-2 to /usr, so a reexec leads to a + # coredump. refuse this reexec and warn the user that they should + # reboot instead. + if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then + echo "warning: refusing to reexec systemd. the system should be rebooted." + else + systemctl daemon-reload + systemctl daemon-reexec + fi + fi + + # getty@tty1.service is no longer enabled by default, but we don't want to break + # existing setups. + if [ "$(vercmp 183 "$2")" -eq 1 ]; then + # systemctl seems to be whiny on sysvinit. this will succeed unless something + # horrific happens, so just mask the error. + systemctl -q enable getty@.service || true + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD new file mode 100644 index 000000000..3d2f9f76f --- /dev/null +++ b/testing/xz/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 162176 2012-06-22 16:39:50Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# Contributor: François Charette <firmicus@gmx.net> + +pkgname=xz +pkgver=5.0.4 +pkgrel=1 +pkgdesc='Library and command line tools for XZ and LZMA compressed files' +arch=('i686' 'x86_64') +url='http://tukaani.org/xz/' +license=('GPL' 'LGPL' 'custom') +depends=('sh') +options=('!libtool') +source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") +md5sums=('df3df690aef18384e1e031be7ec3a964' + '6e203465ee9b8f646d85cf84755e2b32') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-werror + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 +} |