From 7e7561a9640d0e1f54288a391239feb6bd691b56 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 May 2013 06:21:03 -0700 Subject: Fri May 31 06:21:01 PDT 2013 --- core/keyutils/PKGBUILD | 22 ++- core/keyutils/request-key.conf.patch | 21 +++ core/nfs-utils/PKGBUILD | 47 +++--- core/nfs-utils/blkmapd.service | 2 +- core/nfs-utils/id_resolver.conf | 1 + core/nfs-utils/nfs-common | 315 ----------------------------------- core/nfs-utils/nfs-server | 299 --------------------------------- core/nfs-utils/nfsd.service | 8 +- core/nfs-utils/rpc-gssd.service | 2 +- core/nfs-utils/rpc-idmapd.service | 2 +- core/nfs-utils/rpc-mountd.service | 2 +- core/nfs-utils/rpc-statd.service | 2 +- core/nfs-utils/rpc-svcgssd.service | 2 +- core/nfs-utils/start-statd.patch | 22 +-- core/rpcbind/PKGBUILD | 18 +- core/rpcbind/rpcbind | 39 ----- 16 files changed, 86 insertions(+), 718 deletions(-) create mode 100644 core/keyutils/request-key.conf.patch create mode 100644 core/nfs-utils/id_resolver.conf delete mode 100644 core/nfs-utils/nfs-common delete mode 100644 core/nfs-utils/nfs-server delete mode 100755 core/rpcbind/rpcbind (limited to 'core') diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 61f3db2e2..dc3b0cd27 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 185695 2013-05-17 11:13:15Z stephane $ +# $Id: PKGBUILD 186780 2013-05-31 07:19:13Z tpowa $ # Maintainer: Stéphane Gaudreault # Contributor: Tobias Powalowski pkgname=keyutils pkgver=1.5.5 -pkgrel=4 +pkgrel=5 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64) url="http://www.kernel.org" license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) -source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d759680b2f23c99af95938f5026f25fb') +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +request-key.conf.patch) +md5sums=('d759680b2f23c99af95938f5026f25fb' + '89a819a7e4e90936b210c9d5020d296d') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix paths of binaries in /etc/request-key.conf + patch -Np0 -i ../request-key.conf.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin' } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install - # add nfsidmap to config file #30396 - echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf - echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \ - >> $pkgdir/etc/request-key.conf } diff --git a/core/keyutils/request-key.conf.patch b/core/keyutils/request-key.conf.patch new file mode 100644 index 000000000..9ab479631 --- /dev/null +++ b/core/keyutils/request-key.conf.patch @@ -0,0 +1,21 @@ +--- request-key.conf.old 2013-05-28 15:34:10.966001242 +0200 ++++ request-key.conf 2013-05-28 15:35:34.857969598 +0200 +@@ -31,11 +31,11 @@ + + #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... + #====== ======= =============== =============== =============================== +-create dns_resolver * * /sbin/key.dns_resolver %k +-create user debug:* negate /bin/keyctl negate %k 30 %S +-create user debug:* rejected /bin/keyctl reject %k 30 %c %S +-create user debug:* expired /bin/keyctl reject %k 30 %c %S +-create user debug:* revoked /bin/keyctl reject %k 30 %c %S +-create user debug:loop:* * |/bin/cat ++create dns_resolver * * /usr/bin/key.dns_resolver %k ++create user debug:* negate /usr/bin/keyctl negate %k 30 %S ++create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S ++create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S ++create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S ++create user debug:loop:* * |/usr/bin/cat + create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +-negate * * * /bin/keyctl negate %k 30 %S ++negate * * * /usr/bin/keyctl negate %k 30 %S diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index cbfb91384..3a1f08c0a 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185039 2013-05-10 16:21:44Z tomegun $ +# $Id: PKGBUILD 186779 2013-05-31 07:19:12Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.8 -pkgrel=3 +pkgrel=6 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -20,7 +20,6 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn nfs-server.conf exports idmapd.conf - start-statd.patch nfs nfs-utils-1.1.4-mtab-sym.patch nfs-utils-1.1.4-no-exec.patch @@ -33,54 +32,59 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount blkmapd.service - nfs-utils.conf) + nfs-utils.conf + id_resolver.conf + start-statd.patch) install=nfs-utils.install md5sums=('6e7d97de51e428a0b8698c16ca23db77' 'f73f197a16b02c3e248488ec35c4cf43' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e9144277a89a620d9bc80413158a7d27' 'f5e7bba09a46c5c5d7007cac6eff9df5' '7674106eaaa4c149bccd4f05fe3604e9' '4f4827dfc93008dfadd0a530ad0872b2' - '3694619813cebc5b4502b58f1992b442' - '965311784d49a7d126d512cadbe91deb' - 'e05705d9ccccaeaeb1ecaee20adc05bc' - '359d84a85f8781dc3f45f4cf1dbe4b53' - 'beff8a426b3b14c46e3e78a2a283e2ab' - '5d33d2e754fd37280365b287603bac90' + '6aeb4a80b2a5162f5951438474ea22f3' + 'ff95ad9275ef774e0a2ea8adfe55ee66' + '2e991f0e440b4809e22b6c7689544fc0' + '42d0088add3beab0284be1379391382b' + '60d82e2d2d19d21ceb72665e54bf913e' + '3bcc9901478f4f9ea0a03b67171c13e3' '1cd65909fa0983047f3f06a3ab352401' '8f1b5282795895c9b8ce8430d20cdda6' - '8ffc2ebe932d29efe17d6f3f23d5b975' - '8ac484023d786766d287ccbe878ae4ba') + '8f03e708b230619ffc2a799a48bffb53' + '8ac484023d786766d287ccbe878ae4ba' + 'bed57f7c3911af695ec7b469248c104a' + 'f8bb29c2ca1ce178e6371091a3e1090d') prepare() { cd $srcdir/${pkgname}-${pkgver} patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch + # fix /usr/bin in start-statd shell script + patch -Np1 -i ../start-statd.patch #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - # arch specific patch - patch -Np0 -i $srcdir/start-statd.patch } build() { cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ + ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41 --enable-gss \ --without-tcp-wrappers --with-statedir=/var/lib/nfs \ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ - --enable-mountconfig - + --enable-mountconfig --with-start-statd=/usr/bin/start-statd + # move mount helpers to /usr/bin + sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile + # move osd_login to /usr/bin + sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/osd_login/Makefile make } package() { cd $srcdir/${pkgname}-${pkgver} # fix make install - mkdir -p $pkgdir/sbin make DESTDIR=$pkgdir install # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} + sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats} # Configuration install -D -m 644 ../exports "$pkgdir/"etc/exports @@ -89,6 +93,8 @@ package() { install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf + # keyutils id_resolver #35463 + install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf # systemd files for i in ${srcdir}/*.{service,mount}; do install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" @@ -99,3 +105,4 @@ package() { mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs mkdir "$pkgdir/"var/lib/nfs/v4recovery } + diff --git a/core/nfs-utils/blkmapd.service b/core/nfs-utils/blkmapd.service index 16cb68bbb..fa7ce394b 100644 --- a/core/nfs-utils/blkmapd.service +++ b/core/nfs-utils/blkmapd.service @@ -5,7 +5,7 @@ Requires=var-lib-nfs-rpc_pipefs.mount [Service] Type=forking -ExecStart=/usr/sbin/blkmapd +ExecStart=/usr/bin/blkmapd [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/id_resolver.conf b/core/nfs-utils/id_resolver.conf new file mode 100644 index 000000000..9c0fee337 --- /dev/null +++ b/core/nfs-utils/id_resolver.conf @@ -0,0 +1 @@ +create id_resolver * * /usr/bin/nfsidmap %k %d \ No newline at end of file diff --git a/core/nfs-utils/nfs-common b/core/nfs-utils/nfs-common deleted file mode 100644 index 7b16b4b3c..000000000 --- a/core/nfs-utils/nfs-common +++ /dev/null @@ -1,315 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-common - -NEED_STATD= -STATD_OPTS= -NEED_IDMAPD= -IDMAPD_OPTS= -NEED_GSSD= -GSSD_OPTS= -PIPEFS_MOUNTPOINT= -PIPEFS_MOUNTOPTS= - -# rpc.statd daemon & binary location -STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.gssd daemon & binary location -GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default mountpoint and options for rpc_pipefs filesystem -[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" -[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" - -# Parse the fstab file, and determine whether we need idmapd and gssd. (The -# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) -AUTO_NEED_IDMAPD=no -AUTO_NEED_GSSD=no - -if [ -f /etc/fstab ]; then - exec 9<&0 /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } - rc=0 - if [ "$NEED_STATD" = yes ]; then - stat_busy "Starting $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid - # RUN - $STATD $STATD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - # Run sm-notify - /usr/sbin/sm-notify $SMNOTIFY_OPTS - fi - - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - stat_busy "Mounting pipefs filesystem" - do_modprobe sunrpc - do_modprobe nfs - do_modprobe nfsd - do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid - # RUN - $IDMAPD $IDMAPD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid - # RUN - $GSSD $GSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Stopping $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true - fi - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Stopping $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Daemon $STATD_DAEMON_NAME running" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Daemon $GSSD_DAEMON_NAME running" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Daemon $IDMAPD_DAEMON_NAME running" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|restart}" -esac -exit 0 - diff --git a/core/nfs-utils/nfs-server b/core/nfs-utils/nfs-server deleted file mode 100644 index 6aa609d8c..000000000 --- a/core/nfs-utils/nfs-server +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-server - -NFSD_COUNT= -NFSD_OPTS= -NEED_SVCGSSD= -SVCGSSD_OPTS= -MOUNTD_OPTS= -PROCNFSD_MOUNTPOINT= -PROCNFSD_MOUNTOPTS= - -# rpc.nfsd daemon & binary location -NFSD_PROCESS_NAME=nfsd -NFSD_DAEMON_NAME=rpc.nfsd -NFSD="/usr/sbin/rpc.nfsd" - -# rpc.svcgssd daemon & binary location -SVCGSSD_DAEMON_NAME=rpc.svcgssd -SVCGSSD="/usr/sbin/rpc.svcgssd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.mountd daemon & binary location -MOUNTD_DAEMON_NAME=rpc.mountd -MOUNTD="/usr/sbin/rpc.mountd" - -# exortfs binary location -EXPORTFS="/usr/sbin/exportfs" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default number of nfsd servers -[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 - -# Default mountpoint and options for nfsd filesystem -[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" -[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" - -case "$NEED_SVCGSSD" in - yes|no) - ;; - *) - NEED_SVCGSSD=no - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } - rc=0 - stat_busy "Mounting nfsd filesystem" - do_modprobe nfsd - do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Starting $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid - # RUN - $NFSD $NFSD_OPTS $NFSD_COUNT - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid - # RUN - $SVCGSSD $SVCGSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - PID=$(get_pid $IDMAPD) - [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null - - stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid - # RUN - $MOUNTD $MOUNTD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - stat_busy "Stopping $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (SIGINT) - [ ! -z "$PID" ] && kill -2 $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - sleep 1 - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (KILL) - just to be sure - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - # - rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - stat_busy "Unexporting all directories" - $EXPORTFS -au - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - # flush everything out of the kernels export table - if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then - $EXPORTFS -f - fi - do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - stat_busy "Daemon $NFSD_DAEMON_NAME running" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - stat_busy "Daemon $MOUNTD_DAEMON_NAME running" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - reload) - rc=0 - stat_busy "Re-exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|reload|restart}" -esac -exit 0 diff --git a/core/nfs-utils/nfsd.service b/core/nfs-utils/nfsd.service index e5481c3d1..d63e49016 100644 --- a/core/nfs-utils/nfsd.service +++ b/core/nfs-utils/nfsd.service @@ -6,10 +6,10 @@ Requires=rpcbind.service [Service] Type=oneshot EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT -ExecStartPost=/usr/sbin/exportfs -a -ExecStop=/usr/sbin/rpc.nfsd 0 -ExecStopPost=/usr/sbin/exportfs -a -u +ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT +ExecStartPost=/usr/bin/exportfs -a +ExecStop=/usr/bin/rpc.nfsd 0 +ExecStopPost=/usr/bin/exportfs -a -u RemainAfterExit=yes [Install] diff --git a/core/nfs-utils/rpc-gssd.service b/core/nfs-utils/rpc-gssd.service index da4c71307..182d9b72c 100644 --- a/core/nfs-utils/rpc-gssd.service +++ b/core/nfs-utils/rpc-gssd.service @@ -7,7 +7,7 @@ Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS +ExecStart=/usr/bin/rpc.gssd $GSSD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-idmapd.service b/core/nfs-utils/rpc-idmapd.service index 7785c1bd5..1167daf36 100644 --- a/core/nfs-utils/rpc-idmapd.service +++ b/core/nfs-utils/rpc-idmapd.service @@ -7,7 +7,7 @@ Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS +ExecStart=/usr/bin/rpc.idmapd $IDMAPD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service index edd8c851d..7528884c2 100644 --- a/core/nfs-utils/rpc-mountd.service +++ b/core/nfs-utils/rpc-mountd.service @@ -6,7 +6,7 @@ Requires=rpcbind.service nfsd.service [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS +ExecStart=/usr/bin/rpc.mountd $MOUNTD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-statd.service b/core/nfs-utils/rpc-statd.service index 46e19673e..c2fd63b3d 100644 --- a/core/nfs-utils/rpc-statd.service +++ b/core/nfs-utils/rpc-statd.service @@ -7,7 +7,7 @@ Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.statd $STATD_OPTS +ExecStart=/usr/bin/rpc.statd $STATD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-svcgssd.service b/core/nfs-utils/rpc-svcgssd.service index 8152e8338..876bad38c 100644 --- a/core/nfs-utils/rpc-svcgssd.service +++ b/core/nfs-utils/rpc-svcgssd.service @@ -6,7 +6,7 @@ Requires=rpcbind.service [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS +ExecStart=/usr/bin/rpc.svcgssd $SVCGSSD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/start-statd.patch b/core/nfs-utils/start-statd.patch index 5d73b6e35..6f6f1194d 100644 --- a/core/nfs-utils/start-statd.patch +++ b/core/nfs-utils/start-statd.patch @@ -1,22 +1,10 @@ ---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 -+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 -@@ -1,9 +1,16 @@ --#!/bin/bash -p -+#!/bin/sh -+ -+# Original script provided by the NFS project -+# Modified for Arch Linux by Tom Killian -+ - # nfsmount calls this script when mounting a filesystem with locking - # enabled, but when statd does not seem to be running (based on +--- nfs-utils-1.2.8/utils/statd/start-statd.old 2013-05-23 11:35:10.408221686 +0200 ++++ nfs-utils-1.2.8/utils/statd/start-statd 2013-05-23 11:35:22.191356904 +0200 +@@ -4,6 +4,6 @@ # /var/run/rpc.statd.pid). # It should run statd with whatever flags are apropriate for this # site. -PATH=/sbin:/usr/sbin --exec rpc.statd --no-notify -+ -+# source application-specific settings -+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf -+ -+exec /usr/sbin/rpc.statd $STATD_OPTS ++PATH=/sbin:/usr/sbin:/usr/bin + exec rpc.statd --no-notify diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index b892ede0a..241e09780 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185041 2013-05-10 16:21:46Z tomegun $ +# $Id: PKGBUILD 186778 2013-05-31 07:19:10Z tpowa $ # Maintainer: Tobias Powalowski pkgname=rpcbind pkgver=0.2.0 -pkgrel=11 +pkgrel=12 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64) depends=('bash' 'glibc' 'libtirpc') @@ -12,17 +12,19 @@ license=('custom') replaces=('portmap') source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 rpcbind-sunrpc.patch - rpcbind.service - rpcbind) + rpcbind.service) md5sums=('1a77ddb1aaea8099ab19c351eeb26316' 'c02ac36a98baac70b8a26190524b7b73' - 'a7b23a32be2eb52d7dec52da36d4eba1' - '78a963654f57cbb209e228884767836e') + 'a7b23a32be2eb52d7dec52da36d4eba1') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver # patch for iana services file patch -Np1 -i ../rpcbind-sunrpc.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run make } @@ -37,8 +39,6 @@ package() { make DESTDIR=$pkgdir install # install missing man page - https://bugs.archlinux.org/task/21271 install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/ - # install daemon - install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind # install systemd service file install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service # install license diff --git a/core/rpcbind/rpcbind b/core/rpcbind/rpcbind deleted file mode 100755 index 87c5b50da..000000000 --- a/core/rpcbind/rpcbind +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$(pidof -o %PPID /usr/bin/rpcbind)" -case "$1" in - start) - stat_busy "Starting rpcbind" - [ -z "$PID" ] && /usr/bin/rpcbind &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/bin/rpcbind) - echo $PID > /var/run/rpcbind.pid - add_daemon rpcbind - stat_done - fi - ;; - stop) - stat_busy "Stopping rpcbind" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/rpcbind.pid - rm_daemon rpcbind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -- cgit v1.2.3-54-g00ecf From f8a7f10fa1675bee536e1fdb4672c3d84e779d1c Mon Sep 17 00:00:00 2001 From: root Date: Sat, 1 Jun 2013 00:09:42 -0700 Subject: Sat Jun 1 00:09:42 PDT 2013 --- community/fcgiwrap/PKGBUILD | 7 +- community/gkrellm/PKGBUILD | 8 +- community/gkrellm/gkrellmd | 40 ---- community/glusterfs/PKGBUILD | 10 +- community/glusterfs/glusterd.service | 2 +- community/lib32-libtxc_dxtn/PKGBUILD | 36 ---- community/libvirt/PKGBUILD | 13 +- community/nodejs/PKGBUILD | 6 +- community/ntop/PKGBUILD | 11 +- community/ntop/ntop | 38 ---- community/ntop/ntop.conf.d | 5 - community/parrot/PKGBUILD | 6 +- community/sshguard/PKGBUILD | 4 +- community/uml_utilities/PKGBUILD | 26 --- community/webfs/PKGBUILD | 11 +- community/webfs/webfsd.rc | 38 ---- core/dosfstools/PKGBUILD | 24 +++ ...dosfstools-3.0.12-fix-alloc-rootdir-entry.patch | 25 +++ extra/dosfstools/PKGBUILD | 24 --- ...dosfstools-3.0.12-fix-alloc-rootdir-entry.patch | 25 --- extra/epiphany/PKGBUILD | 10 +- extra/gnome-nettool/PKGBUILD | 11 +- extra/gnome-nettool/printf.patch | 34 ---- extra/kismet/PKGBUILD | 12 +- extra/liblo/PKGBUILD | 20 +- extra/libxinerama/PKGBUILD | 7 +- extra/libxp/PKGBUILD | 11 +- extra/libxres/PKGBUILD | 7 +- extra/libxt/PKGBUILD | 9 +- extra/libxtst/PKGBUILD | 9 +- extra/libxxf86dga/PKGBUILD | 7 +- extra/libxxf86vm/PKGBUILD | 9 +- extra/oxygen-gtk2/PKGBUILD | 6 +- extra/oxygen-gtk3/PKGBUILD | 6 +- extra/sane/PKGBUILD | 7 +- extra/snd/PKGBUILD | 6 +- extra/transmission/PKGBUILD | 11 +- extra/transmission/transmissiond | 46 ----- extra/transmission/transmissiond.conf | 4 - libre/cgminer-libre/PKGBUILD | 10 +- libre/iceweasel-l10n/PKGBUILD | 2 +- libre/mkisolinux/PKGBUILD | 13 +- libre/mkisolinux/mkisolinux | 1 - libre/mkisolinux/mkisolinux.conf | 2 +- libre/mksyslinux/PKGBUILD | 26 +++ libre/mksyslinux/boot.msg | 15 ++ libre/mksyslinux/mksyslinux | 143 +++++++++++++ libre/mksyslinux/mksyslinux.conf | 34 ++++ libre/mksyslinux/options.msg | 6 + pcr/cluster-glue/PKGBUILD | 139 +++++++++---- pcr/ha-heartbeat/PKGBUILD | 84 -------- pcr/ha-heartbeat/ha-heartbeat.service | 10 - pcr/ha-pacemaker/PKGBUILD | 83 -------- pcr/ha-resourceagent/PKGBUILD | 68 ------- pcr/ha-resourceagent/ha-ldirector.service | 10 - pcr/heartbeat/PKGBUILD | 204 +++++++++++++++++++ pcr/openhpi/PKGBUILD | 113 ++++++++--- pcr/openipmi/PKGBUILD | 125 ++++++++++-- pcr/pacemaker/PKGBUILD | 221 +++++++++++++++++++++ pcr/resource-agent/PKGBUILD | 202 +++++++++++++++++++ 60 files changed, 1319 insertions(+), 783 deletions(-) delete mode 100644 community/gkrellm/gkrellmd delete mode 100644 community/lib32-libtxc_dxtn/PKGBUILD delete mode 100644 community/ntop/ntop delete mode 100644 community/ntop/ntop.conf.d delete mode 100644 community/uml_utilities/PKGBUILD delete mode 100644 community/webfs/webfsd.rc create mode 100644 core/dosfstools/PKGBUILD create mode 100644 core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch delete mode 100644 extra/dosfstools/PKGBUILD delete mode 100644 extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch delete mode 100644 extra/gnome-nettool/printf.patch delete mode 100644 extra/transmission/transmissiond delete mode 100644 extra/transmission/transmissiond.conf create mode 100644 libre/mksyslinux/PKGBUILD create mode 100644 libre/mksyslinux/boot.msg create mode 100755 libre/mksyslinux/mksyslinux create mode 100644 libre/mksyslinux/mksyslinux.conf create mode 100644 libre/mksyslinux/options.msg delete mode 100644 pcr/ha-heartbeat/PKGBUILD delete mode 100644 pcr/ha-heartbeat/ha-heartbeat.service delete mode 100644 pcr/ha-pacemaker/PKGBUILD delete mode 100644 pcr/ha-resourceagent/PKGBUILD delete mode 100644 pcr/ha-resourceagent/ha-ldirector.service create mode 100644 pcr/heartbeat/PKGBUILD create mode 100644 pcr/pacemaker/PKGBUILD create mode 100644 pcr/resource-agent/PKGBUILD (limited to 'core') diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD index b42bf575d..068d81a63 100644 --- a/community/fcgiwrap/PKGBUILD +++ b/community/fcgiwrap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92039 2013-05-31 00:13:34Z seblu $ +# $Id: PKGBUILD 92086 2013-05-31 10:35:32Z seblu $ # Maintainer: Lukas Fleischer # Contributor: Aaron Bull Schaefer # Contributor: Ron Huang pkgname=fcgiwrap pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc='A simple server for running CGI applications over FastCGI.' arch=('i686' 'x86_64') url='http://nginx.localdomain.pl/wiki/FcgiWrap' @@ -20,7 +20,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" autoreconf --install - ./configure --prefix=/usr --mandir=/share/man --sbindir=/usr/bin + # Here --sbindir is implicitly prefixed by /usr + ./configure --prefix=/usr --mandir=/share/man --sbindir=/bin make } diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD index 7feef83b4..efb22b4f9 100644 --- a/community/gkrellm/PKGBUILD +++ b/community/gkrellm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79153 2012-10-31 05:24:09Z ebelanger $ +# $Id: PKGBUILD 92097 2013-05-31 14:27:10Z foutrelis $ # Maintainer: dorphell # Contributor: Matt Smith (Majik) # Contributor: Jaroslav Lichtblau @@ -6,7 +6,7 @@ # Contributor: Alexander Rødseth pkgname=gkrellm pkgver=2.3.5 -pkgrel=3 +pkgrel=4 pkgdesc="System monitor package for GTK2" arch=('x86_64' 'i686') url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" @@ -15,9 +15,8 @@ depends=('gtk2' 'libsm' 'lm_sensors') makedepends=('gettext') backup=('etc/gkrellmd.conf') source=("http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2" - "gkrellmd" "gkrellm.service") + "gkrellm.service") sha256sums=('702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b' - 'c6d532dd7a706891aed92d750bceda74d4618e86ad82feadc0503214de904360' '2829931127632d0391f6749024809594b78c138fe4f03c98cd65fdbd47cea376') build() { @@ -31,7 +30,6 @@ package() { make DESTDIR="$pkgdir" PREFIX=/usr install install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf" - install -Dm755 "../gkrellmd" "$pkgdir/etc/rc.d/gkrellmd" install -Dm644 "../gkrellm.service" "$pkgdir/usr/lib/systemd/system/gkrellm.service" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/gkrellm/gkrellmd b/community/gkrellm/gkrellmd deleted file mode 100644 index 1f255e755..000000000 --- a/community/gkrellm/gkrellmd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GKRELLMD_ARGS='-d' - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/gkrellmd) -case "$1" in - start) - stat_busy "Starting GKrellM Daemon" - [ -z "$PID" ] && /usr/bin/gkrellmd ${GKRELLMD_ARGS} - PID=$(pidof -o %PPID /usr/bin/gkrellmd) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gkrellmd - stat_done - fi - ;; - stop) - stat_busy "Stopping GKrellM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gkrellmd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index 82100d9ab..9c53249d6 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 91880 2013-05-28 18:08:16Z spupykin $ +# $Id: PKGBUILD 92113 2013-05-31 16:29:44Z spupykin $ # Maintainer: Sergej Pupykin # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be # henning mueller pkgname=glusterfs -_basever=3.3 -pkgver=$_basever.1 -pkgrel=3 +pkgver=3.3.1 +_basever=`echo $pkgver | cut -f1-2 -d.` +pkgrel=4 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' @@ -19,6 +19,8 @@ source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glus glusterd.service) sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') +sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' + '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/glusterfs/glusterd.service b/community/glusterfs/glusterd.service index c44024317..b1dd5c18d 100644 --- a/community/glusterfs/glusterd.service +++ b/community/glusterfs/glusterd.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/glusterd +ExecStart=/usr/bin/glusterd [Install] WantedBy=multi-user.target diff --git a/community/lib32-libtxc_dxtn/PKGBUILD b/community/lib32-libtxc_dxtn/PKGBUILD deleted file mode 100644 index 6306e1c7e..000000000 --- a/community/lib32-libtxc_dxtn/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 91929 2013-05-29 16:41:31Z lcarlier $ -# Maintainer: Jan "heftig" Steffens - -_pkgbasename=libtxc_dxtn -pkgname=lib32-$_pkgbasename -pkgver=1.0.1 -pkgrel=4 -arch=(x86_64) -pkgdesc="S3 Texture Compression (S3TC) library for Mesa (32-bit)" -url="http://dri.freedesktop.org/wiki/S3TC" -license=(custom:BSD) -depends=(lib32-mesa) -makedepends=(gcc-multilib) -options=(!libtool) -source=(http://people.freedesktop.org/~cbrill/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2) -md5sums=('7105107f07ac49753f4b61ba9d0c79c5') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - CC="gcc -m32" ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir/usr/include" - - # License - mkdir -p "$pkgdir/usr/share/licenses/$pkgname" - sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ - > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 6b6ba9bad..d267f726e 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91813 2013-05-28 11:39:01Z spupykin $ +# $Id: PKGBUILD 92095 2013-05-31 13:59:18Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.5 -pkgrel=5 +pkgrel=7 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -50,17 +50,18 @@ build() { done export LDFLAGS=-lX11 - export RADVD=/usr/sbin/radvd - [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ + export RADVD=/usr/bin/radvd + [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \ --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd --with-audit \ --with-qemu-user=nobody --with-qemu-group=nobody \ --without-netcf --with-interface \ - --with-dnsmasq-path=/usr/bin/dnsmasq + --with-dnsmasq-path=/usr/bin/dnsmasq \ + --with-iptables-path=/usr/bin/iptables make sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service - sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service + sed -i 's|@sbindir@|/usr/bin|g' src/virtlockd.service sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf } diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 643ea3673..8b1c40d5a 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91630 2013-05-25 17:27:12Z bpiotrowski $ +# $Id: PKGBUILD 92090 2013-05-31 11:38:30Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.8 +pkgver=0.10.9 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('edf6f766c8ccc7ef5b02a50c94567343eb1ffae479db93684ba89976e3f18354') +sha256sums=('25fb276ac6765ebb19f44d3e3775ed1c0275f874c896755d0d619226caee9c30') prepare() { cd node-v$pkgver diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index b6e1a6dc1..1689d4a55 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81126 2012-12-12 00:49:38Z eric $ +# $Id: PKGBUILD 92109 2013-05-31 15:39:41Z foutrelis $ # Maintainer: Lukas Fleischer # Contributor: Douglas Soares de Andrade pkgname=ntop pkgver=5.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64') url='http://www.ntop.org/' @@ -14,12 +14,8 @@ makedepends=('subversion' 'wget' 'ca-certificates') options=('!libtool' '!makeflags') install='ntop.install' source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz" - 'ntop' - 'ntop.conf.d' 'ntop.service') md5sums=('01710b6925a8a5ffe1a41b8b512ebd69' - '7b0d7bb57432e768ff387e9f7236f87c' - '6a9371de1dcf31d8ef13a4cf349c02b3' '0e149d20f881600e8387d850ac268483') build() { @@ -37,9 +33,6 @@ package() { install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop" install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd" - install -Dm0755 "${srcdir}/ntop" "${pkgdir}/etc/rc.d/ntop" - install -Dm0644 "${srcdir}/ntop.conf.d" "${pkgdir}/etc/conf.d/ntop" - for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do _plug="$(basename ${_f})" ln -sf "../../lib${_plug}" "${_f}" diff --git a/community/ntop/ntop b/community/ntop/ntop deleted file mode 100644 index 2f0dbcbdd..000000000 --- a/community/ntop/ntop +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/ntop ] && . /etc/conf.d/ntop - -case "$1" in - start) - stat_busy "Starting ntop daemon" - /usr/bin/ntop -d ${NTOP_ARGS} 2>&1 >> ${NTOP_LOG} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ntop - stat_done - fi - ;; - stop) - stat_busy "Stopping ntop daemon" - killall /usr/bin/ntop &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ntop - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ntop/ntop.conf.d b/community/ntop/ntop.conf.d deleted file mode 100644 index 28e2a3166..000000000 --- a/community/ntop/ntop.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Parameters to be passed to ntop. -NTOP_ARGS="-i eth0 -w 3000" - -# Location of the log file. -NTOP_LOG="/var/log/ntop.log" diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 176196262..c7169a504 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88524 2013-04-19 10:31:48Z spupykin $ +# $Id: PKGBUILD 92115 2013-05-31 16:30:12Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: mpie pkgname=parrot -pkgver=5.3.0 +pkgver=5.4.0 #_rel=stable _rel=devel pkgrel=1 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('4f9fd4994bffd7664901dcace9ab6c16') +md5sums=('5f4603d4c4ee8d60826e56f9012d2e99') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index 386d73c83..758fa96da 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90628 2013-05-13 12:25:45Z mtorromeo $ +# $Id: PKGBUILD 92088 2013-05-31 11:33:59Z mtorromeo $ # Maintainer: Sergej Pupykin # Maintainer: Massimiliano Torromeo pkgname=sshguard pkgver=1.5 -pkgrel=12 +pkgrel=13 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64') #url="http://sourceforge.net/projects/sshguard/" diff --git a/community/uml_utilities/PKGBUILD b/community/uml_utilities/PKGBUILD deleted file mode 100644 index 958997347..000000000 --- a/community/uml_utilities/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mike Sampson -# Contributor: Jason Chu -# Contributor: Juergen Hoetzel - -pkgname=uml_utilities -pkgver=20070815 -pkgrel=5 -pkgdesc="User Mode Linux Utilities" -arch=(i686 x86_64) -depends=('fuse' 'readline' 'perl') -url="http://user-mode-linux.sourceforge.net/" -source=(http://user-mode-linux.sourceforge.net/${pkgname}_${pkgver}.tar.bz2) -license=('GPL2') -md5sums=('b0468ac8b79cef53f36f5f9517907462') - -build() { - cd $srcdir/tools-$pkgver - sed 's|lib64|lib|g' -i Makefile - make all -} - -package() { - cd $srcdir/tools-$pkgver - make DESTDIR=$pkgdir install - chown root $pkgdir/usr/bin/* -} diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD index e15dba63e..580b9053d 100644 --- a/community/webfs/PKGBUILD +++ b/community/webfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79331 2012-11-03 03:32:04Z kkeen $ +# $Id: PKGBUILD 92107 2013-05-31 15:10:32Z foutrelis $ # Maintainer: Kyle Keen # Contributor: Roman Kyrylych # Contributor: Mark Rosenstand @@ -7,18 +7,18 @@ pkgname=webfs pkgver=1.21 -pkgrel=9 +pkgrel=10 pkgdesc="Simple and instant http server for mostly static content." arch=(i686 x86_64) url="http://linux.bytesex.org/misc/webfs.html" license=("GPL") depends=('mime-types' 'openssl') -backup=(etc/conf.d/webfsd) +backup=('etc/conf.d/webfsd') source=(http://dl.bytesex.org/releases/webfs/webfs-${pkgver}.tar.gz - webfsd.rc webfsd.conf webfs.patch + webfsd.conf + webfs.patch webfsd.service) md5sums=('6dc125fe160479404147e7bbfc781dbc' - '3ae9fcdcf79b193aa88e386055e9ebd7' 'b2c1ab041a82acd8391b06dc38d986be' '7294edcec2589df04bb775270d56536e' 'e1202dd915cba1a02e0016aa3a516b4a') @@ -34,7 +34,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make prefix=/usr DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/webfsd.rc" "$pkgdir/etc/rc.d/webfsd" install -Dm644 "$srcdir/webfsd.conf" "$pkgdir/etc/conf.d/webfsd" install -Dm755 "$srcdir/webfsd.service" "$pkgdir/usr/lib/systemd/system/webfsd.service" } diff --git a/community/webfs/webfsd.rc b/community/webfs/webfsd.rc deleted file mode 100644 index 1c854ebdb..000000000 --- a/community/webfs/webfsd.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# source application-specific settings -[ -f /etc/conf.d/webfsd ] && . /etc/conf.d/webfsd - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID webfsd` -case "$1" in - start) - stat_busy "Starting webfsd" - [ -z "$PID" ] && /usr/bin/webfsd ${WEBFSD_ARGS} & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon webfsd - stat_done - fi - ;; - stop) - stat_busy "Stopping webfsd" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon webfsd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD new file mode 100644 index 000000000..ad0747bee --- /dev/null +++ b/core/dosfstools/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 186902 2013-05-31 16:49:40Z tpowa $ +# Maintainer: dorphell +# Committer: Judd Vinet +pkgname=dosfstools +pkgver=3.0.17 +pkgrel=1 +pkgdesc="DOS filesystem utilities" +arch=(i686 x86_64) +depends=('glibc') +source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +url="http://www.daniel-baumann.ch/software/dosfstools/" +license=('GPL2') + +build() { + cd $srcdir/$pkgname-$pkgver + make +} + +package () { + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install +} +md5sums=('468b953ddc8baf66e9881d1a5eae03e2' + 'SKIP') diff --git a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch new file mode 100644 index 000000000..44e6e86b5 --- /dev/null +++ b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch @@ -0,0 +1,25 @@ +--- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 ++++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 +@@ -174,7 +174,10 @@ + offset = fs->root_start + next_free * sizeof(DIR_ENT); + memset(de, 0, sizeof(DIR_ENT)); + while (1) { +- sprintf((char *)de->name, pattern, curr_num); ++ char expanded[12]; ++ sprintf(expanded, pattern, curr_num); ++ memcpy(de->name, expanded, 8); ++ memcpy(de->ext, expanded + 8, 3); + for (scan = 0; scan < fs->root_entries; scan++) + if (scan != next_free && + !strncmp((const char *)root[scan].name, +--- dosfstools-3.0.12/src/fat.c ++++ dosfstools-3.0.12/src/fat.c +@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) + DIR_ENT de; + loff_t offset; + files++; +- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); ++ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); + de.start = CT_LE_W(i & 0xffff); + if (fs->fat_bits == 32) + de.starthi = CT_LE_W(i >> 16); diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD deleted file mode 100644 index 63834267f..000000000 --- a/extra/dosfstools/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 186622 2013-05-30 05:56:36Z tpowa $ -# Maintainer: dorphell -# Committer: Judd Vinet -pkgname=dosfstools -pkgver=3.0.17 -pkgrel=1 -pkgdesc="DOS filesystem utilities" -arch=(i686 x86_64) -depends=('glibc') -source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -url="http://www.daniel-baumann.ch/software/dosfstools/" -license=('GPL2') - -build() { - cd $srcdir/$pkgname-$pkgver - make -} - -package () { - cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install -} -md5sums=('468b953ddc8baf66e9881d1a5eae03e2' - 'SKIP') diff --git a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch deleted file mode 100644 index 44e6e86b5..000000000 --- a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 -+++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 -@@ -174,7 +174,10 @@ - offset = fs->root_start + next_free * sizeof(DIR_ENT); - memset(de, 0, sizeof(DIR_ENT)); - while (1) { -- sprintf((char *)de->name, pattern, curr_num); -+ char expanded[12]; -+ sprintf(expanded, pattern, curr_num); -+ memcpy(de->name, expanded, 8); -+ memcpy(de->ext, expanded + 8, 3); - for (scan = 0; scan < fs->root_entries; scan++) - if (scan != next_free && - !strncmp((const char *)root[scan].name, ---- dosfstools-3.0.12/src/fat.c -+++ dosfstools-3.0.12/src/fat.c -@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) - DIR_ENT de; - loff_t offset; - files++; -- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); -+ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = CT_LE_W(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = CT_LE_W(i >> 16); diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 99eac194a..5a3fe907b 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183349 2013-04-21 22:08:53Z heftig $ +# $Id: PKGBUILD 186906 2013-05-31 18:10:20Z heftig $ # Maintainer: Jan de Groot pkgname=epiphany -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -15,12 +15,16 @@ options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f') +sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index 97913cd16..447ee5733 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $ +# $Id: PKGBUILD 186905 2013-05-31 18:09:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Kritoke pkgname=gnome-nettool -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64) @@ -16,14 +16,11 @@ optdepends=('nmap: Port scanning' groups=(gnome-extra) url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - printf.patch) -sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28' - '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1') build() { cd $pkgname-$pkgver - patch -Np1 -i ../printf.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch deleted file mode 100644 index 89868411a..000000000 --- a/extra/gnome-nettool/printf.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c ---- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200 -+++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200 -@@ -232,13 +232,13 @@ - text_rx_bytes = util_legible_bytes (netload.bytes_in); - text_tx_bytes = util_legible_bytes (netload.bytes_out); - -- g_sprintf (rx_pkt, "%lld", netload.packets_in); -- g_sprintf (tx_pkt, "%lld", netload.packets_out); -+ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in); -+ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out); - -- g_sprintf (rx_error, "%lld", netload.errors_in); -- g_sprintf (tx_error, "%lld", netload.errors_out); -+ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in); -+ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out); - -- g_sprintf (collisions, "%lld", netload.collisions); -+ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions); - - gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes); - gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt); -diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c ---- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200 -+++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200 -@@ -272,7 +272,7 @@ - unit = "KiB"; - } - -- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10, -+ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10, - short_rx % 10, unit); - return result; - } diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index 3e808f48f..b19a2f399 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 171085 2012-11-16 14:51:57Z allan $ +# $Id: PKGBUILD 186877 2013-05-31 13:31:02Z andrea $ # Maintainer: # Contributor: Angel Velasquez # Contributor: Jason Chu # Contributor: Juergen Hoetzel pkgname=kismet -pkgver=2011_03_R2 +pkgver=2013_03_R1b _realver="${pkgver//_/-}" -pkgrel=5 +pkgrel=1 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl' 'libusb-compat') +depends=('libpcap' 'pcre' 'bluez') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' 'wireshark-cli: mergecap, to merge multiple capture files' @@ -24,8 +24,8 @@ backup=('etc/kismet.conf' 'etc/kismet_drone.conf') install=kismet.install changelog=kismet.changelog source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz"{,.asc}) -md5sums=('8bf077e8111e6dc8c12cadefdf40aadd' - '500deff918ede6d0bc392a0419322833') +md5sums=('6cdcd78baf2e15edbe8a9de3c5493f02' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${_realver}" diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD index dbeb8f6b9..8f0ac3746 100644 --- a/extra/liblo/PKGBUILD +++ b/extra/liblo/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 150414 2012-02-17 12:41:31Z allan $ +# $Id: PKGBUILD 186897 2013-05-31 15:30:05Z schiv $ +# Maintainer: Ray Rashif # Contributor: damir # Contributor: Pajaro pkgname=liblo -pkgver=0.26 -pkgrel=2 +pkgver=0.27 +pkgrel=1 pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://plugin.org.uk/liblo/" license=('GPL') +depends=('glibc') options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('5351de14262560e15e7f23865293b16f') +md5sums=('e4317bab5b16003df350adfe2c181364') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD index 043cf6f9b..60df0d2ab 100644 --- a/extra/libxinerama/PKGBUILD +++ b/extra/libxinerama/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $ +# $Id: PKGBUILD 186881 2013-05-31 14:01:07Z andyrtr $ +# Maintainer: AndyRTR # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=libxinerama -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="X11 Xinerama extension library" arch=('i686' 'x86_64') @@ -13,7 +14,7 @@ depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") -sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd') +sha256sums=('7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2') build() { cd "${srcdir}/libXinerama-${pkgver}" diff --git a/extra/libxp/PKGBUILD b/extra/libxp/PKGBUILD index 5e33fa581..24784103f 100644 --- a/extra/libxp/PKGBUILD +++ b/extra/libxp/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151429 2012-02-26 10:49:41Z pierre $ -#Maintainer: Jan de Groot +# $Id: PKGBUILD 186883 2013-05-31 14:02:47Z andyrtr $ +# Maintainer: AndyRTR +# Maintainer: Jan de Groot pkgname=libxp -pkgver=1.0.1 -pkgrel=3 +pkgver=1.0.2 +pkgrel=1 pkgdesc="X11 X Print Library" arch=('i686' 'x86_64') license=('custom') @@ -13,7 +14,7 @@ makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2") license=('custom') -sha1sums=('9c76823c7cfcb43f097963d0c930dcc4e38807a8') +sha256sums=('952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5') build() { cd "${srcdir}/libXp-${pkgver}" diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD index b2b18476e..1f9c12f09 100644 --- a/extra/libxres/PKGBUILD +++ b/extra/libxres/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 152788 2012-03-09 16:26:13Z andyrtr $ +# $Id: PKGBUILD 186885 2013-05-31 14:04:26Z andyrtr $ +# Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=libxres -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="X11 Resource extension library" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ depends=('libxext') makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2") -sha1sums=('31a9b7d4f7a978de36c6f1c867dced29bfe7ef0f') +sha256sums=('26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5') build() { cd "${srcdir}/libXres-${pkgver}" diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD index 8fd5b915a..6e785da24 100644 --- a/extra/libxt/PKGBUILD +++ b/extra/libxt/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ -#Maintainer: Jan de Groot +# $Id: PKGBUILD 186887 2013-05-31 14:06:19Z andyrtr $ +# Maintainer: AndyRTR +# Maintainer: Jan de Groot pkgname=libxt -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") -sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') +sha256sums=('843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57') build() { cd "${srcdir}/libXt-${pkgver}" diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD index 810b6d11b..a6fadf2fa 100644 --- a/extra/libxtst/PKGBUILD +++ b/extra/libxtst/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 152793 2012-03-09 16:30:31Z andyrtr $ +# $Id: PKGBUILD 186893 2013-05-31 14:14:53Z andyrtr $ +# Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=libxtst -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="X11 Testing -- Resource extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libxext' 'libxi' 'recordproto' 'inputproto') +depends=('libxext' 'libxi' 'recordproto' 'inputproto' 'libxfixes') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2") -sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2') +sha256sums=('ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9') build() { cd "${srcdir}/libXtst-${pkgver}" diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD index c5be1ace8..eca6bf486 100644 --- a/extra/libxxf86dga/PKGBUILD +++ b/extra/libxxf86dga/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152799 2012-03-09 16:36:28Z andyrtr $ +# $Id: PKGBUILD 186889 2013-05-31 14:07:54Z andyrtr $ +# Maintainer: AndyRTR # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=libxxf86dga -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="X11 Direct Graphics Access extension library" arch=('i686' 'x86_64') @@ -13,7 +14,7 @@ depends=('libxext' 'xf86dgaproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2) -sha1sums=('5af5d7d2f239b31035ae5b9d3e3718c833af8b56') +sha256sums=('8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e') build() { cd "${srcdir}/libXxf86dga-${pkgver}" diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD index 0be6a068b..367db6a24 100644 --- a/extra/libxxf86vm/PKGBUILD +++ b/extra/libxxf86vm/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 152801 2012-03-09 16:38:21Z andyrtr $ -#Maintainer: Jan de Groot +# $Id: PKGBUILD 186891 2013-05-31 14:09:38Z andyrtr $ +# Maintainer: AndyRTR +# Maintainer: Jan de Groot pkgname=libxxf86vm -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686') @@ -12,7 +13,7 @@ depends=('libxext' 'xf86vidmodeproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f') +sha256sums=('da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8') build() { cd "${srcdir}/libXxf86vm-${pkgver}" diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index c7e193f16..11cb23c57 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183540 2013-04-22 20:14:05Z andrea $ +# $Id: PKGBUILD 186908 2013-05-31 18:38:20Z andrea $ # Maintainer: Andrea Scarpino # Contributor: birdflesh pkgname=oxygen-gtk2 -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('37b24d69d386eca5b4382424002ed762') +md5sums=('10a78d31de95168eae861d9c5b4be9ed') build() { mkdir build diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index d1ae980e1..b5d305d83 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183542 2013-04-22 20:16:28Z andrea $ +# $Id: PKGBUILD 186910 2013-05-31 18:41:51Z andrea $ # Maintainer: Andrea Scarpino pkgname=oxygen-gtk3 -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('63ae9752dd39a3310d20d973dd6ea247') +md5sums=('6c6db0188d3780173af1994f34db8a71') build() { mkdir build diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index b73a8d808..e43ede0ad 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185795 2013-05-19 09:05:59Z tpowa $ +# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Sarah Hay # Contributor: Simo L. @@ -6,12 +6,12 @@ pkgname=sane pkgver=1.0.23 -pkgrel=5 +pkgrel=6 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') +depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') 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,kodakaio.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) source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz @@ -41,6 +41,7 @@ build() { --enable-avahi \ --enable-pthread \ --disable-rpath \ + --enable-libusb_1_0 \ --disable-locking make } diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 4607e6441..894ad7771 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185448 2013-05-14 10:13:02Z schiv $ +# $Id: PKGBUILD 186867 2013-05-31 11:57:47Z schiv $ # Maintainer: Ray Rashif # Contributor: Juergen Hoetzel # Contributor: see .contrib pkgname=snd -pkgver=13.6 +pkgver=13.7 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('8da59d2bfe4aa2c6ae3aa07fcc6ee6eb') +md5sums=('220b0155bace73d4442374a837c2f5fd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 017f68452..434c12b62 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 179032 2013-03-01 18:56:31Z andrea $ +# $Id: PKGBUILD 186895 2013-05-31 15:05:32Z foutrelis $ # Maintainer : Ionut Biru pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.77 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz - transmissiond transmissiond.conf transmission.systemd + transmission.systemd transmission.tmpfiles) md5sums=('60c0e77a1852656215f7102a437b2a3d' - '7d6186ee2a852ae3d44980f05063e194' - 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' '23f2320361ad54373c3a4551ef634fe8') @@ -30,7 +28,6 @@ build() { package_transmission-cli() { pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" depends=('curl' 'libevent') - backup=('etc/conf.d/transmissiond') install=transmission-cli.install cd $pkgbase-$pkgver @@ -40,8 +37,6 @@ package_transmission-cli() { make -C "$dir" DESTDIR="$pkgdir" install done - install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" - install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond deleted file mode 100644 index ea3d770f9..000000000 --- a/extra/transmission/transmissiond +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/transmissiond - -PID=`pidof -o %PPID /usr/bin/transmission-daemon` -case "$1" in - start) - stat_busy "Starting Transmission Daemon" - [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon transmissiond - stat_done - fi - ;; - stop) - stat_busy "Stopping Transmission Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon transmissiond - stat_done - fi - ;; - restart) - $0 stop - while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done - $0 start - ;; - reload) - stat_busy "Reloading config" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/extra/transmission/transmissiond.conf b/extra/transmission/transmissiond.conf deleted file mode 100644 index 45a9fd51d..000000000 --- a/extra/transmission/transmissiond.conf +++ /dev/null @@ -1,4 +0,0 @@ -# example configuration file - -# TRANS_USER="transmission" -# TRANS_ARGS="" diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 575ea2d55..2db7dbbc5 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90344 2013-05-11 16:51:20Z fyan $ +# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $ # Maintainer: Felix Yan # Contributor: monson # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.1.1 +pkgver=3.2.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -18,7 +18,7 @@ makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=("https://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v$pkgver.tar.gz" +source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-${pkgver}.tar.bz2" "${pkgname%-$_pkgflag}.conf.d" "${pkgname%-$_pkgflag}.service") backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") @@ -34,7 +34,7 @@ build() { # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - ./autogen.sh + #./autogen.sh ./configure --prefix=/usr --enable-scrypt --disable-adl make @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('f95db6ab14fe35ed19c1af152c6eb979787e966afad250252053bf11abe8293dfe857a7a2abfd9e33b60a190b310193a03151eb67a9db255a2a929660278ad62' +sha512sums=('e96b874fd53c771535098c1077200b5ab88aa628383f7af56f861c952a534283942ce34647f279bf4229bfc3a0114f81a7ae3deca4e8e7931d7551fdb75c68c0' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 3c3d957a4..298d740cc 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD index 1c02bb01b..7c9ab6cc4 100644 --- a/libre/mkisolinux/PKGBUILD +++ b/libre/mkisolinux/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer : Tobias Powalowski pkgname=mkisolinux -pkgver=2013.03 -pkgrel=2 +pkgver=2013.05 +pkgrel=1 pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" arch=(any) license=('GPL') @@ -12,10 +12,7 @@ depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') replaces=('mkbootcd') backup=(etc/mkisolinux.conf) source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') -md5sums=('945d5f5d74f37718c8c9d518bfd5698d' - 'e28b82502ae44087852ea6bfac398d5c' - '456eba83dfba319f8132c89e7ba42ce5' - 'ae0007d6679b5a575b2a9e5ac3664baf') + package() { @@ -25,3 +22,7 @@ package() install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg" install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg" } +md5sums=('945d5f5d74f37718c8c9d518bfd5698d' + '384aac3786506ff96ec3d1147bcacfe5' + '3cc23d74d7e4378d1be431d68a71a173' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux index 0cb53e81e..ce1187d2a 100755 --- a/libre/mkisolinux/mkisolinux +++ b/libre/mkisolinux/mkisolinux @@ -65,7 +65,6 @@ install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux. for i in /usr/lib/syslinux/*.c32; do install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) done -install -m644 /lib/modules/$(uname -r)/modules.pcimap ${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids # create syslinux.cfg echo ":: Creating syslinux.cfg ..." diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf index 83d36219d..4af6f098c 100644 --- a/libre/mkisolinux/mkisolinux.conf +++ b/libre/mkisolinux/mkisolinux.conf @@ -2,7 +2,7 @@ # Rebranded for Parabola by André Silva # config file of mkisolinux -# DEFAULT kernel boot options like root=/dev/hda3 etc. +# DEFAULT kernel boot options like root=/dev/sda3 etc. # add your root= option, if you boot from a disk device # and don't want to add it by hand on each boot KERNEL_BOOT_OPTIONS="" diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD new file mode 100644 index 000000000..16d595f12 --- /dev/null +++ b/libre/mksyslinux/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $ +# Maintainer : Tobias Powalowski + +pkgname=mksyslinux +pkgver=2013.05 +pkgrel=1 +pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" +arch=(any) +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'syslinux' 'pciutils') +backup=(etc/mksyslinux.conf) +source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg') + +package() +{ + cd "$srcdir/" + install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux" + install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf" + install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg" + install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" +} +md5sums=('287aad9693ca8061495e248c41ba43a7' + 'd958575945e4ce8a9002bd056e2f14be' + '1f1e2d80e28b087e4103282bc5c44071' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg new file mode 100644 index 000000000..15476f2bd --- /dev/null +++ b/libre/mksyslinux/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +SYSLINUX BOOT +created with 'mksyslinux' by Tobias Powalowski +rebranded for Parabola by André Silva + +Press ENTER or type 'parabola' to boot image. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img ' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux new file mode 100755 index 000000000..4db771f83 --- /dev/null +++ b/libre/mksyslinux/mksyslinux @@ -0,0 +1,143 @@ +#! /bin/sh +# Created by Tobias Powalowski +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mksyslinux.conf" +export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX) +TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX) +BOOTDIRNAME=boot/syslinux + +usage () +{ + echo "${APPNAME}: usage" + echo "WRITING TO DEVICE:" + echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!" + echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!" + echo "" + echo "CREATING AN IMAGE FILE:" + echo "- For creating an image file use the -i=IMAGEFILE switch" + echo "- use 'dd if= of=' to write to your device afterwards." + echo "" + echo "PARAMETERS:" + echo " -d=DEVICE Your DEVICE first partition from /dev/xxx tree to install" + echo " -i=IMAGENAME Your IMAGENAME" + echo " -c=CONFIG Use CONFIG file. default: /etc/mksyslinux.conf" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage && exit 1 + + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;; + -i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +if [ "${IMAGENAME}" = "" ]; then + if [ "${DEVICE}" = "" ]; then + echo "ERROR: No DEVICE name specified, please use the -d option" + exit 1 + fi +fi + +if ! [ $UID -eq 0 ]; then + echo "ERROR: only works when run as root!" + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')" + +export RUNPROGRAM="${APPNAME}" +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +export USEKERNEL=${VERSION} +# begin script +[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} +mkdir -p ${TEMPDIR}/$BOOTDIRNAME +echo ":: Mounting ${DEVICE} ..." +if ! [ "${IMAGENAME}" = "" ]; then + modprobe loop +else + mount ${DEVICE} ${TEMPDIR} || exit 1 +fi +# prepare syslinux bootloader +install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin +for i in /usr/lib/syslinux/*.c32; do + install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) +done +install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids + +# create syslinux.cfg +echo ":: Creating syslinux.cfg ..." +if [ "${SYSLINUXCFG}" = "" ]; then + [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +fi +[ ! -s ${TEMPDIR}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +if ! [ "${IMAGENAME}" = "" ]; then + # ext2 overhead's upper bound is 6% + # empirically tested up to 1GB + rootsize=$(du -bs ${TEMPDIR}|cut -f1) + IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors + # create the filesystem image file + dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}" + # create a filesystem on the image + mkfs.vfat "${IMAGENAME}" + mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1 + cp -r "${TEMPDIR}"/* "$TMPDIR" + umount ${TMPDIR} +else + echo ":: Unmounting ${DEVICE} ..." + umount ${TEMPDIR} || exit 1 +fi +if ! [ "${IMAGENAME}" = "" ]; then + echo ":: Installing SYSLINUX on ${IMAGENAME} ..." + syslinux ${IMAGENAME} && echo "Installation completed." +else + echo ":: Installing MBR on ${MBRDEVICE} ..." + cat ${MBR} > ${MBRDEVICE} + echo ":: Installing SYSLINUX on ${DEVICE} ..." + syslinux -o offset ${DEVICE} && echo "Installation completed." +fi +# clean /tmp +rm -r ${TEMPDIR} +! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR} diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf new file mode 100644 index 000000000..ab2d4978a --- /dev/null +++ b/libre/mksyslinux/mksyslinux.conf @@ -0,0 +1,34 @@ +# Created by Tobias Powalowski +# Rebranded for Parabola by André Silva +# config file of mksyslinux + +# DEFAULT kernel boot options like root=/dev/sda3 etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mksyslinux/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg" + +syslinux.cfg file to use +SYSLINUXCFG="" + +# Prompt on boot, 1=yes 0=no +PROMPT="1" + +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" + +# default MBR +MBR="/usr/lib/syslinux/mbr.bin" diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux/options.msg new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mksyslinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +------------------------------------------------------------------------------ diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index f23f88ef3..684efe7c2 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -1,24 +1,23 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=cluster-glue _pkgname1=${pkgname::7} _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} -_grpname=linux-ha pkgver=1.0.11 -pkgrel=9 -pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack' +pkgrel=11 +pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 x86_64 mips64el ) -url=http://$_grpname.org/wiki/$_pkgname +group=linux-ha +url=http://$group.org/wiki/$_pkgname license=( GPL2 LGPL2.1 ) -group=$_grpname depends=( curl dbus-glib @@ -31,14 +30,12 @@ depends=( net-snmp openhpi openipmi + openssh python util-linux - #vacm -) -optdepends=( - net-tools - openssh + #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!! ) +optdepends=net-tools makedepends=( help2man libxslt @@ -53,7 +50,7 @@ provides=(ha-$_pkgname2) conflicts=ha-$_pkgname2 replaces=ha-$_pkgname2 install=$pkgname.install -source=http://hg.$_grpname.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 +source=http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 prepare() { @@ -85,19 +82,23 @@ prepare() { s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|; ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES . | grep Makefile.am) + ' $(grep -rl INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh .) - sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/bin .) + ' $(grep -rl bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin' .) + ' $(grep -rl ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin' .) - sed -i 's|/var/lock|/run/lock|; - ' $(grep -rl /var/lock .) + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + #sed -i 's|usr/libexec|usr/lib|; + # ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) sed -i 's|var/run|run|; ' $(grep -rl var/run) @@ -106,40 +107,92 @@ prepare() { s|open source / ||; s|Open Source|Free Software|; s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; ' $(grep -ril 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; s|OpenSource|FreeSoftware|; s|opensource|freesoftware|; + s|freesoftware.org|opensource.org|; + s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; ' $(grep -ril opensource) # remove Linux term - sed -i '/, Linux/ s|Linux|GNU/Linux|; - /And Linux/ s|Linux|GNU/Linux|; - /and Linux/ s|Linux|GNU/Linux|; - /For Linux/ s|Linux|GNU/Linux|; - /for Linux/ s|Linux|GNU/Linux|; - /Like Linux/ s|Linux|GNU/Linux|; - /like Linux/ s|Linux|GNU/Linux|; - /Linux,/ s|Linux|GNU/Linux|; - /Linux and/ s|Linux|GNU/Linux|; - /Linux distribution/ s|Linux|GNU/Linux|; - /Linux machine/ s|Linux|GNU/Linux|; - /Linux operating/ s|Linux|GNU/Linux|; - /Linux OS/ s|Linux|GNU/Linux|; - /Linux specific/ s|Linux|GNU/Linux|; - /Linux system/ s|Linux|GNU/Linux|; - /Under Linux/ s|Linux|GNU/Linux|; - /under Linux/ s|Linux|GNU/Linux|; - /On Linux/ s|Linux|GNU/Linux|; - /on Linux/ s|Linux|GNU/Linux|; - /(e.g. Linux)/ s|Linux|GNU/Linux|; - /High-Availability Linux/ s|Linux|GNU/Linux|; - /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|; - /This is what the Linux/ s|Linux|GNU/Linux|; + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; s|GNU/Linux kernel|Linux kernel|; s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; ' $(grep -rl Linux) } diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD deleted file mode 100644 index f913344a0..000000000 --- a/pcr/ha-heartbeat/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# Maintainer (Parabola): Márcio Silva - -pkgname=ha-heartbeat -_pkgname=${pkgname:3} -pkgver=3.0.5 -_pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=6 -pkgdesc='Daemon that provides cluster infrastructure services to its clients' -arch=( - i686 - x86_64 - mips64el -) -url=http://linux-ha.org/wiki/${_pkgname^} -license=( - GPL2 - lGPL2.1 -) -depends=( - gnutls - ha-glue -) -optdepends=( - lynx - net-tools - openssh - swig - valgrind - w3m -) -makedepends=( - docbook-xsl - libxslt - lynx - net-tools - openssh - swig - valgrind - w3m -) -options=!libtool -source=( - http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 - $pkgname.service -) -sha512sums=( - e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d - d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20 -) - -prepare() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - mv configure.{in,ac} - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; - s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; - ' configure.ac - sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; - " configure.ac - sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am -} - -build() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - setarch $CARCH ./bootstrap - setarch $CARCH ./configure --prefix=/usr\ - --disable-fatal-warnings\ - --enable-static=no\ - --enable-valgrind\ - --libdir=/usr/lib\ - --localstatedir=/var\ - --sysconfdir=/etc - setarch $CARCH make -} - -package() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-heartbeat/ha-heartbeat.service b/pcr/ha-heartbeat/ha-heartbeat.service deleted file mode 100644 index aacde3dbb..000000000 --- a/pcr/ha-heartbeat/ha-heartbeat.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Startup script high-availability services. -Requires=network.target remote-fs.target timers.target - -[Service] -Type=forking -ExecStart=/usr/lib/heartbeat/heartbeat - -[Install] -WantedBy=multi-user.target diff --git a/pcr/ha-pacemaker/PKGBUILD b/pcr/ha-pacemaker/PKGBUILD deleted file mode 100644 index 2cd0be84c..000000000 --- a/pcr/ha-pacemaker/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# Maintainer (Parabola): Márcio Silva - -pkgname=ha-pacemaker -_pkgname=${pkgname:3} -pkgver=1.1.9 -pkgrel=3 -pkgdesc='Cluster resource manager' -arch=( - i686 - x86_64 - mips64el -) -url=http://linux-ha.org/wiki/${_pkgname^} -license=GPL2 -depends=( - corosync - ha-heartbeat - ha-resourceagent - libqb -) -optdepens=( - inkscape - lynx - openssh - valgrind - w3m -) -makedepends=( - help2man - inkscape - libxslt - lynx - openssh - valgrind - w3m -) -options=(!libtool) -source=https://github.com/ClusterLabs/$_pkgname/archive/${_pkgname^}-$pkgver.tar.gz -sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071 - -prepare() { - cd $srcdir/$_pkgname-${_pkgname^}-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; - s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; - ' configure.ac - sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {cib,crmd,cts,lib/{cib,cluster,common,fencing,lrmd,pengine,services,transition},mcp,pengine,replace,tools}/Makefile.am -} - -build() { - cd $srcdir/$_pkgname-${_pkgname^}-$pkgver - setarch $CARCH ./autogen.sh - setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings=yes\ - --disable-static\ - --enable-systemd\ - --enable-upstart\ - --libdir=/usr/lib\ - --libexecdir=/usr/lib\ - --localstatedir=/var\ - --sysconfdir=/etc\ - --with-acl\ - --with-ais\ - --with-cibsecrets\ - --with-cman\ - --with-corosync\ - --with-cs-quorum\ - --with-esmtp\ - --with-heartbeat\ - --with-lcrso-dir=/usr/lib/lcrso\ - --with-nagios\ - --with-profiling\ - --with-snmp\ - --without-gcov - setarch $CARCH make -} - -package() { - cd $srcdir/$_pkgname-${_pkgname^}-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - mv $pkgdir/usr/sbin/cibsecret{,-pacemaker} -} diff --git a/pcr/ha-resourceagent/PKGBUILD b/pcr/ha-resourceagent/PKGBUILD deleted file mode 100644 index 15438769a..000000000 --- a/pcr/ha-resourceagent/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer (Parabola): Márcio Silva - -pkgname=ha-resourceagent -_pkgname=${pkgname:3} -_xname=${_pkgname::8} -_yname=${_pkgname:8} -_Name=${_xname^}_${_yname^} -_name=${_xname}-${_yname}s -pkgver=3.9.5 -pkgrel=3 -pkgdesc='Standardized interface for a cluster resource' -arch=( - i686 - x86_64 - mips64el -) -url=http://linux-ha.org/wiki/$_Name -license=GPL -depends=ha-glue -optdepends=( - net-tools - openssh -) -makedepends=( - #libxslt - libvirt - net-tools - openssh -) -source=( - https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz - ha-ldirector.service -) -sha512sums=( - 668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e - 9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3 -) - -prepare() { - cd $srcdir/$_name-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; - ' configure.ac - sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {heartbeat,tools}/Makefile.am -} - -build() { - cd $srcdir/$_name-$pkgver - setarch $CARCH ./autogen.sh - setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings\ - --enable-libnet\ - --libdir=/usr/lib\ - --localstatedir=/var\ - --sysconfdir=/etc\ - --with-ocf-root=/usr/lib/ocf - setarch $CARCH make -} - -package() { - cd $srcdir/$_name-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-resourceagent/ha-ldirector.service b/pcr/ha-resourceagent/ha-ldirector.service deleted file mode 100644 index c5809a216..000000000 --- a/pcr/ha-resourceagent/ha-ldirector.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Non-heartbeat systems service, that manages the Linux Virtual Server component for TCP/UDP load-balancing. -Requires=network.target remote-fs.target - -[Service] -Type=forking -ExecStart=/usr/sbin/ldirectord - -[Install] -WantedBy=multi-user.target diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD new file mode 100644 index 000000000..cf2269d70 --- /dev/null +++ b/pcr/heartbeat/PKGBUILD @@ -0,0 +1,204 @@ +# Maintainer: Márcio Silva + +pkgname=heartbeat +pkgver=3.0.5 +_pkgver=${pkgver::1}_${pkgver:2:1} +pkgrel=9 +pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)' +arch=( + i686 + x86_64 + mips64el +) +group=linux-ha +url=http://$group.org/wiki/${pkgname^} +license=( + GPL2 + lGPL2.1 +) +depends=( + gnutls + cluster-glue +) +optdepends=( + net-tools + openssh +) +makedepends=( + docbook-xsl + libxslt + lynx + net-tools + openssh + swig + valgrind + w3m +) +options=(!libtool) +provides=(ha-$pkgname) +conflicts=ha-$pkgname +replaces=ha-$pkgname +source=http://hg.$group.org/$pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 +sha512sums=e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d + +prepare() { + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver + + mv configure.{in,ac} + + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; + " configure.ac + + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + #sed -i 's|usr/libexec|usr/lib|; + # ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # s|freesoftware.org|opensource.org|; + # s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + # s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + # s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + /Linux: "mail" offers "-s"./ s|Linux|GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + s|ConfigureLinux|ConfigureGNULinux|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver + setarch $CARCH ./bootstrap + setarch $CARCH ./configure --prefix=/usr\ + --disable-fatal-warnings\ + --disable-static\ + --enable-valgrind\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc + setarch $CARCH make +} + +package() { + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + rm $pkgdir/etc/rc.d/$pkgname && rmdir $pkgdir/etc/rc.d + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Description=Startup script high-availability services' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Requires=network.target remote-fs.target timers.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'ExecStart=/usr/lib/heartbeat/heartbeat' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD index 7da1cc055..bffcc74ba 100644 --- a/pcr/openhpi/PKGBUILD +++ b/pcr/openhpi/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=openhpi pkgver=3.2.0 -pkgrel=3 +pkgrel=4 pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' arch=( i686 @@ -22,15 +22,26 @@ sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0ae prepare() { cd $srcdir/$pkgname-$pkgver + _automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||') + sed -i "/am__api_version=/ s|1.12|${_automake::4}|; + " $(grep -rl am__api_version=) + + #sed -i 's|INCLUDES|AM_CPPFLAGS|; + # ' $(grep -rl INCLUDES | grep Makefile.am) + # fixing path sed -i 's|bin/sh|usr/bin/bash|; ' $(grep -rl bin/sh) - sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/bin) sed -i 's| /bin| /usr/bin|; ' $(grep -rl ' /bin') sed -i 's| /sbin| /usr/bin|; ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + sed -i 's|usr/libexec|usr/lib|; + ' $(grep -rl usr/libexec) sed -i 's|var/lock|run/lock|; ' $(grep -rl var/lock) sed -i 's|var/run|run|; @@ -41,36 +52,92 @@ prepare() { # s|open source / ||; # s|Open Source|Free Software|; # s|open source|free software|; + # s|Free Software Development Lab|Open Source Development Lab|; # ' $(grep -ril 'open source') #sed -i 's|OpenSource / ||; # s|opensource / ||; # s|OpenSource|FreeSoftware|; # s|opensource|freesoftware|; + # s|freesoftware.org|opensource.org|; + # s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + # s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + # s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; # ' $(grep -ril opensource) # remove Linux term - sed -i '/, Linux/ s|Linux|GNU/Linux|; - /And Linux/ s|Linux|GNU/Linux|; - /and Linux/ s|Linux|GNU/Linux|; - /For Linux/ s|Linux|GNU/Linux|; - /for Linux/ s|Linux|GNU/Linux|; - /Like Linux/ s|Linux|GNU/Linux|; - /like Linux/ s|Linux|GNU/Linux|; - /Linux,/ s|Linux|GNU/Linux|; - /Linux and/ s|Linux|GNU/Linux|; - /Linux distribution/ s|Linux|GNU/Linux|; - /Linux machine/ s|Linux|GNU/Linux|; - /Linux operating/ s|Linux|GNU/Linux|; - /Linux OS/ s|Linux|GNU/Linux|; - /Linux specific/ s|Linux|GNU/Linux|; - /Linux system/ s|Linux|GNU/Linux|; - /Under Linux/ s|Linux|GNU/Linux|; - /under Linux/ s|Linux|GNU/Linux|; - /On Linux/ s|Linux|GNU/Linux|; - /on Linux/ s|Linux|GNU/Linux|; + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; s|GNU/Linux kernel|Linux kernel|; s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; ' $(grep -rl Linux) } diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD index 9c3c73ed8..cced11d05 100644 --- a/pcr/openipmi/PKGBUILD +++ b/pcr/openipmi/PKGBUILD @@ -6,7 +6,7 @@ _pkgname2=${pkgname:4} _pkgname=${_pkgname1^}${_pkgname2^^} pkgver=2.0.19 _pkgver=${pkgver::3} -pkgrel=2 +pkgrel=3 pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})" arch=( i686 @@ -38,41 +38,126 @@ sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44c prepare() { cd $srcdir/$_pkgname-$pkgver + #mv configure.{in,ac} + + #_automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||') + #sed -i "/am__api_version=/ s|1.11|${_automake::4}|; + # " $(grep -rl am__api_version=) + + #sed -i "s|AC_INIT(README.Force)|AC_INIT(OpenIPMI, $pkgver|; + # " configure.ac + #sed -i 's|AM_INIT_AUTOMAKE(OpenIPMI, ${OPENIPMI_VERSION_MAJOR}.${OPENIPMI_VERSION_MINOR}.${OPENIPMI_VERSION_RELEASE}${OPENIPMI_VERSION_EXTRA})|AM_INIT_AUTOMAKE|; + # ' configure.ac + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + sed -i 's|usr/libexec|usr/lib|; + ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + #sed -i 's|var/run|run|; + # ' $(grep -rl var/run) + # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; s|Open Source|Free Software|; s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; ' $(grep -ril 'open source') #sed -i 's|OpenSource / ||; # s|opensource / ||; # s|OpenSource|FreeSoftware|; # s|opensource|freesoftware|; + # s|freesoftware.org|opensource.org|; + # s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + # s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + # s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; # ' $(grep -ril opensource) # remove Linux term - sed -i '/, Linux/ s|Linux|GNU/Linux|; - /And Linux/ s|Linux|GNU/Linux|; - /and Linux/ s|Linux|GNU/Linux|; - /For Linux/ s|Linux|GNU/Linux|; - /for Linux/ s|Linux|GNU/Linux|; - /Like Linux/ s|Linux|GNU/Linux|; - /like Linux/ s|Linux|GNU/Linux|; - /Linux,/ s|Linux|GNU/Linux|; - /Linux and/ s|Linux|GNU/Linux|; - /Linux distribution/ s|Linux|GNU/Linux|; - /Linux machine/ s|Linux|GNU/Linux|; - /Linux operating/ s|Linux|GNU/Linux|; - /Linux OS/ s|Linux|GNU/Linux|; - /Linux specific/ s|Linux|GNU/Linux|; - /Linux system/ s|Linux|GNU/Linux|; - /Under Linux/ s|Linux|GNU/Linux|; - /under Linux/ s|Linux|GNU/Linux|; - /On Linux/ s|Linux|GNU/Linux|; - /on Linux/ s|Linux|GNU/Linux|; + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; s|GNU/Linux kernel|Linux kernel|; s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; ' $(grep -rl Linux) } diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD new file mode 100644 index 000000000..10d32ad33 --- /dev/null +++ b/pcr/pacemaker/PKGBUILD @@ -0,0 +1,221 @@ +# Maintainer: Márcio Silva + +pkgname=pacemaker +pkgver=1.1.9 +pkgrel=4 +pkgdesc='Cluster resource manager (Linux-HA)' +arch=( + i686 + x86_64 + mips64el +) +group=linux-ha +url=http://$group.org/wiki/${pkgname^} +license=GPL2 +depends=( + corosync + heartbeat + jre7-openjdk + resource-agent + libqb + libxslt + #saxon.jar? +) +optdepens=openssh +makedepends=( + help2man + inkscape + libxslt + lynx + openssh + valgrind + w3m +) +options=(!libtool) +provides=(ha-$pkgname) +conflicts=ha-$pkgname +replaces=ha-$pkgname +source=https://github.com/ClusterLabs/$pkgname/archive/${pkgname^}-$pkgver.tar.gz +sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071 + +prepare() { + cd $srcdir/$pkgname-${pkgname^}-$pkgver + + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + sed -i 's|/lib64|/lib|; + ' $(grep -rl /lib64) + sed -i 's|usr/libexec|usr/lib|; + ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + s|freesoftware.org|opensource.org|; + s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux) + sed -i 's|Linux|GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux | grep .po) +} + +build() { + cd $srcdir/$pkgname-${pkgname^}-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --disable-static\ + --enable-fatal-warnings\ + --enable-systemd\ + --enable-upstart\ + --libdir=/usr/lib\ + --libexecdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-acl\ + --with-ais\ + --with-cibsecrets\ + --with-cman\ + --with-corosync\ + --with-cs-quorum\ + --with-esmtp\ + --with-heartbeat\ + --with-lcrso-dir=/usr/lib/lcrso\ + --with-nagios\ + --with-profiling\ + --with-snmp\ + --without-gcov + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-${pkgname^}-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mv $pkgdir/usr/sbin/cibsecret{,-$pkgname} +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD new file mode 100644 index 000000000..46c95ede1 --- /dev/null +++ b/pcr/resource-agent/PKGBUILD @@ -0,0 +1,202 @@ +# Maintainer: Márcio Silva + +pkgname=resource-agent +_pkgname1=${pkgname::8} +_pkgname2=${pkgname:9} +_pkgnamex=${_pkgname1^}_${_pkgname2^} +_pkgnamey=${pkgname}s +_pkgnamez=ha-${_pkgname1}${_pkgname2} +pkgver=3.9.5 +pkgrel=5 +pkgdesc='Standardized interface for a cluster resource (Linux-HA)' +arch=( + i686 + x86_64 + mips64el +) +group=linux-ha +url=http://$group.org/wiki/$_pkgnamex +license=GPL +depends=( + cluster-glue + ipvsadm + perl-socket6 + perl-lwp-protocol-https + perl-io-socket-inet6 + perl-mailtools + #rgmanager (clulog) !!redhat-cluster!! +) +optdepends=net-tools +makedepends=( + libxslt + libvirt + net-tools + openssh +) +options=(!libtool) +provides=($_pkgnamez) +conflicts=$_pkgnamez +replaces=$_pkgnamez +source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz +sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e + +prepare() { + cd $srcdir/$_pkgnamey-$pkgver + + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + ' configure.ac + + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + sed -i 's|/lib64|/lib|; + ' $(grep -rl /lib64) + #sed -i 's|usr/libexec|usr/lib|; + # ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + s|freesoftware.org|opensource.org|; + s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|; + / 2.6, the alignment should be / s|GNU/Linux|Linux|; + s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$_pkgnamey-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings\ + --enable-libnet\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc\ + --with-ocf-root=/usr/lib/ocf + setarch $CARCH make +} + +package() { + cd $srcdir/$_pkgnamey-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mv $pkgdir/{var/,}run + touch $pkgdir/etc/ha.d/ldirectord.cf + rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Description=Non-heartbeat systems service, that manages the LVS component for TCP/UDP load-balancing' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'ExecStart=/usr/bin/ldirectord' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf