From d738a3149083b4ec3be046be490fb36a17eb0b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Sat, 8 Nov 2014 05:45:53 -0200 Subject: rebuild usermin and webmin --- libre/usermin/PKGBUILD | 4 ++-- libre/webmin/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD index 2ec5cae60..600e34db0 100644 --- a/libre/usermin/PKGBUILD +++ b/libre/usermin/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Arch): Tobias Powalowski pkgname=usermin pkgver=1.610 -pkgrel=1.parabola1 +pkgrel=1.parabola2 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:usermin') @@ -109,7 +109,7 @@ package() { "$pkgdir"/opt/usermin/setup.sh # Fixup the config files to use their real locations - sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf + sed -i 's:^pidfile=.*$:pidfile=/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; # make it only accessible by localhost diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 3dc4b709a..fac84125b 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Arch): Tobias Powalowski pkgname=webmin pkgver=1.710 -pkgrel=1.parabola1 +pkgrel=1.parabola2 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:webmin') @@ -192,7 +192,7 @@ package() { "$pkgdir"/opt/webmin/setup.sh # Fixup the config files to use their real locations - sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf + sed -i 's:^pidfile=.*$:pidfile=/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; # make it only accessible by localhost -- cgit v1.2.3-2-g168b From 0cc910c71082825f62a907c77e4f3754f58fce80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Sat, 8 Nov 2014 06:55:52 -0200 Subject: xarchiver: rebuild pkg --- libre/xarchiver/PKGBUILD | 4 ++-- libre/xarchiver/remove-nonfree-unrar-support.patch | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD index c50f53572..f5bac7d3f 100644 --- a/libre/xarchiver/PKGBUILD +++ b/libre/xarchiver/PKGBUILD @@ -6,7 +6,7 @@ pkgname=xarchiver pkgver=0.5.4 -pkgrel=1.parabola1 +pkgrel=1.parabola2 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support" arch=('i686' 'x86_64' 'mips64el') url="http://xarchiver.sourceforge.net/" @@ -31,7 +31,7 @@ md5sums=('1b4cd37a6af03afc957a8e307417e8d0' '812b93339f5e3332621f3c5abebfe277' '35ab96d98521a0a36f3e9e9ec0969107' '0cee887b3c989ba2cdce9154813843fb' - '064ec8984be6e0e7bbf20c435a9f4ef0') + 'd2cf9b38b439a548553cf0f33d627bcc') prepare() { cd $pkgname-$pkgver diff --git a/libre/xarchiver/remove-nonfree-unrar-support.patch b/libre/xarchiver/remove-nonfree-unrar-support.patch index 5473cf3b3..10c68052b 100644 --- a/libre/xarchiver/remove-nonfree-unrar-support.patch +++ b/libre/xarchiver/remove-nonfree-unrar-support.patch @@ -66,7 +66,8 @@ diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiv All the the output of the cmd-line archiver is displayed in the Xarchiver window - All common formats are supported: arj, bzip2, lha, gzip, 7z, rar, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) + All common formats are supported: arj, bzip2, lha, gzip, 7z, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract) - Support of RPM files without RPM executable. This is useful on not RPM-based distributions like Slackware and Arch Linux +- Support of RPM files without RPM executable. This is useful on not RPM-based distributions like Slackware and Arch Linux ++ Support of RPM files without RPM executable. This is useful on not RPM-based distributions - Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) + Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported) -- cgit v1.2.3-2-g168b From b28abca62c7e3258a0d435b270f66bfd2a727499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Sun, 9 Nov 2014 14:45:52 -0200 Subject: lua-cyrussasl: fix pkgbuild --- pcr/lua-cyrussasl/PKGBUILD | 4 ++-- pcr/lua-cyrussasl/lua-cyrussasl.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcr/lua-cyrussasl/PKGBUILD b/pcr/lua-cyrussasl/PKGBUILD index 987f51507..9e57498a6 100644 --- a/pcr/lua-cyrussasl/PKGBUILD +++ b/pcr/lua-cyrussasl/PKGBUILD @@ -2,7 +2,7 @@ pkgname=lua-cyrussasl pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Lua bindings for Cyrus SASL library." arch=('i686' 'x86_64' 'mips64el') url="http://github.com/JorjBauer/lua-cyrussasl" @@ -13,7 +13,7 @@ source=( "lua-cyrussasl.patch" ) md5sums=('40c94c06441e1e47640d81b125742969' - '838d383edc30f059ddae44cd564e0b82') + 'bdb7b8413f9b7d9598b7c8b820427751') build() { cd $srcdir/*-lua-cyrussasl-* diff --git a/pcr/lua-cyrussasl/lua-cyrussasl.patch b/pcr/lua-cyrussasl/lua-cyrussasl.patch index e119ccb3b..cf1229a3f 100644 --- a/pcr/lua-cyrussasl/lua-cyrussasl.patch +++ b/pcr/lua-cyrussasl/lua-cyrussasl.patch @@ -4,7 +4,7 @@ #LUAPATH=/usr/share/lua/5.1 #CPATH=/usr/lib/lua/5.1 -+# Linux (Arch Linux) ++# Arch/Parabola +CFLAGS=-g -O2 -fpic -I/usr/include/lua5.1 +LDFLAGS=-O -shared -fpic -lsasl2 +LUAPATH=/usr/share/lua/5.1 -- cgit v1.2.3-2-g168b From b531792c1f4537a27bc2a98d3d86df06279d75a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Sun, 9 Nov 2014 15:01:05 -0200 Subject: opendnssec: fix var/run to run --- pcr/opendnssec/PKGBUILD | 14 +++++++------- pcr/opendnssec/pid-path.patch | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD index 7fd21e3ec..54a880757 100644 --- a/pcr/opendnssec/PKGBUILD +++ b/pcr/opendnssec/PKGBUILD @@ -2,7 +2,7 @@ pkgname=opendnssec pkgver=1.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Turn-key solution for DNSSEC (sqlite3)" arch=('i686' 'x86_64' 'mips64el') url="http://www.opendnssec.org/" @@ -18,13 +18,13 @@ source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.s "ods-enforcer.service") sha256sums=('36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101' 'SKIP' - '487a4c05a07feb97c865ddc4c13d00eea6ce8b2b1e5031983c15484f4991ebed' + '1cc1c1ec75a5a5f2c35e019ac6dfd2153fa6f10705dc242aaf6ceb21796097f0' '1a8cdec0e97a33048956268b766da570f8f7a90d05af59e547219f1381832071' '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # /var/lib/run -> /var/run + # /var/lib/run -> /run patch -p0 -i "${srcdir}/pid-path.patch" aclocal @@ -42,7 +42,7 @@ build() { --with-pkcs11-softhsm=/usr/lib/libsofthsm.so \ --sbindir=/usr/bin - # Create the correct (/var/run/opendnssec) directory + # Create the correct (/run/opendnssec) directory sed -i \ -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run\/opendnssec/#Removed/" \ -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run/\$(INSTALL) -d \$(DESTDIR)\$(OPENDNSSEC_PID_DIR)/" \ @@ -54,7 +54,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}/var/run/opendnssec" + install -d "${pkgdir}/run/opendnssec" make DESTDIR="${pkgdir}" install @@ -70,8 +70,8 @@ package() { chown -R 227:227 "${pkgdir}/etc/opendnssec" \ "${pkgdir}/var/lib/opendnssec" \ - "${pkgdir}/var/run/opendnssec" + "${pkgdir}/run/opendnssec" chmod 750 "${pkgdir}/etc/opendnssec" \ "${pkgdir}/var/lib/opendnssec" \ - "${pkgdir}/var/run/opendnssec" + "${pkgdir}/run/opendnssec" } diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch index 88c750cf2..122b68e08 100644 --- a/pcr/opendnssec/pid-path.patch +++ b/pcr/opendnssec/pid-path.patch @@ -6,8 +6,8 @@ $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed - $(INSTALL) -d $(DESTDIR)$(localstatedir)/run - $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec -+ $(INSTALL) -d $(DESTDIR)/var/run -+ $(INSTALL) -d $(DESTDIR)/var/run/opendnssec ++ $(INSTALL) -d $(DESTDIR)/run ++ $(INSTALL) -d $(DESTDIR)/run/opendnssec docs: (cd libhsm; $(MAKE) doxygen) @@ -18,7 +18,7 @@ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec" -OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec" -+OPENDNSSEC_PID_DIR="/var/run/opendnssec" ++OPENDNSSEC_PID_DIR="/run/opendnssec" AC_SUBST([OPENDNSSEC_BIN_DIR]) AC_SUBST([OPENDNSSEC_SBIN_DIR]) -- cgit v1.2.3-2-g168b From 8bf705c39cbee5bbee67e7f3cc7fcb6f4e12ba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Sun, 9 Nov 2014 15:32:12 -0200 Subject: tinc: update pkgbuild --- pcr/tinc/PKGBUILD | 40 +++++++++++++++++++++++----------------- pcr/tinc/tinc.install | 20 ++++++++++++++++++++ pcr/tinc/tincd.conf | 2 -- pcr/tinc/tincd.rcd | 48 ------------------------------------------------ pcr/tinc/tincd@.service | 10 ++++++++++ 5 files changed, 53 insertions(+), 67 deletions(-) create mode 100644 pcr/tinc/tinc.install delete mode 100644 pcr/tinc/tincd.conf delete mode 100644 pcr/tinc/tincd.rcd create mode 100644 pcr/tinc/tincd@.service diff --git a/pcr/tinc/PKGBUILD b/pcr/tinc/PKGBUILD index 87d3415e9..3612d8814 100644 --- a/pcr/tinc/PKGBUILD +++ b/pcr/tinc/PKGBUILD @@ -1,33 +1,39 @@ +# $Id: PKGBUILD 116886 2014-08-05 08:18:32Z tredaelli $ +# Maintainer: Timothy Redaelli +# Contributor: helios +# Contributor: Lothar Gesslein +# Contributor: Dominik George + pkgname=tinc -pkgver=1.0.16 -pkgrel=3 +pkgver=1.0.24 +pkgrel=2 pkgdesc="VPN (Virtual Private Network) daemon" -arch=(i686 x86_64 mips64el) +arch=('i686' 'x86_64' 'mips64el') url="http://www.tinc-vpn.org/" license=('GPL') -depends=('lzo2' 'zlib' 'openssl') -backup=(etc/conf.d/tincd.conf) -source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz - tincd.conf - tincd.rcd) -md5sums=('f1c7ed94878725fb2cf4efb02bf160da' - 'd4a42b4a474448c64dc8f5100480f569' - '89a91a80c1dee4b365958bd9e6242d5a') +depends=('lzo' 'openssl') +install=tinc.install +source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} + tincd@.service) +md5sums=('14a91eb2e85bdc0451a815612521b708' + 'SKIP' + '112327da32fdb56ab779fe004712235f') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -d $pkgdir/etc/{tinc,rc.d,conf.d} + make DESTDIR="$pkgdir/" install + install -dm755 "$pkgdir"/usr/share/tinc/examples + tar xozvf doc/sample-config.tar.gz -C $pkgdir/usr/share/tinc/examples + find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} + + find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} + - install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd - install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd.conf + install -Dm644 "$srcdir/tincd@.service" "$pkgdir/usr/lib/systemd/system/tincd@.service" } diff --git a/pcr/tinc/tinc.install b/pcr/tinc/tinc.install new file mode 100644 index 000000000..1b804fd8d --- /dev/null +++ b/pcr/tinc/tinc.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(tinc.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/pcr/tinc/tincd.conf b/pcr/tinc/tincd.conf deleted file mode 100644 index e86139b44..000000000 --- a/pcr/tinc/tincd.conf +++ /dev/null @@ -1,2 +0,0 @@ -NETNAME=yournetname -OPTIONS="-R -U nobody -L" diff --git a/pcr/tinc/tincd.rcd b/pcr/tinc/tincd.rcd deleted file mode 100644 index 16f39f8ca..000000000 --- a/pcr/tinc/tincd.rcd +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -daemon_name=tincd - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${daemon_name}.conf - -PIDFILE=/var/run/tinc.${NETNAME} -[ -f "${PIDFILE}" ] && PID=$(<${PIDFILE}) - -case "$1" in - start) - stat_busy "Starting ${daemon_name}" - [ -z "$PID" ] && \ - /usr/sbin/tincd -n ${NETNAME} \ - ${OPTIONS} \ - --pidfile=${PIDFILE} &> /dev/null - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ${daemon_name} - stat_done - fi - ;; - stop) - stat_busy "Stopping ${daemon_name}" - [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ${daemon_name} - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - reload) - [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k HUP - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/pcr/tinc/tincd@.service b/pcr/tinc/tincd@.service new file mode 100644 index 000000000..069bf4570 --- /dev/null +++ b/pcr/tinc/tincd@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Tinc daemon for net %i +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/tincd -n %i + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-2-g168b From 39e7daddb73f205693ff52cae7f77601a1eaea00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Sun, 9 Nov 2014 15:48:37 -0200 Subject: inspircd update pkgbuild --- pcr/inspircd/PKGBUILD | 12 ++++------ pcr/inspircd/inspircd.install | 2 +- pcr/inspircd/inspircd.rcd | 54 ------------------------------------------- 3 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 pcr/inspircd/inspircd.rcd diff --git a/pcr/inspircd/PKGBUILD b/pcr/inspircd/PKGBUILD index 3de3d5e57..497f836d1 100644 --- a/pcr/inspircd/PKGBUILD +++ b/pcr/inspircd/PKGBUILD @@ -1,6 +1,6 @@ pkgname=inspircd -pkgver=2.0.8 -pkgrel=2 +pkgver=2.0.18 +pkgrel=1 pkgdesc='A lightweight IRC daemon' arch=('x86_64' 'i686' 'mips64el') url='http://www.inspircd.org/' @@ -20,10 +20,9 @@ optdepends=('gnutls: m_ssl_gnutls' 'tre: m_regex_tre') install=inspircd.install -source=(https://github.com/downloads/inspircd/inspircd/InspIRCd-$pkgver.tar.bz2 - inspircd.rcd inspircd.service) -sha1sums=('c8bcbc222df40bc8110cefdb4a1fee91ad7c73d1' - '59c4aa6929732fb076ca2be96a01385cae9e8484' +source=(https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz + inspircd.service) +sha1sums=('40039d9be51ad28493be16b27c9f20bc7fe617a4' '667b28d0d086be6daad7a0c2f110c68e6526264e') build() { @@ -53,7 +52,6 @@ build() { } package() { - install -Dm755 "${srcdir}"/inspircd.rcd "${pkgdir}"/etc/rc.d/inspircd install -Dm644 "${srcdir}"/inspircd.service "${pkgdir}"/usr/lib/systemd/system/inspircd.service install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd" diff --git a/pcr/inspircd/inspircd.install b/pcr/inspircd/inspircd.install index ec97113f5..2d1ce16f4 100644 --- a/pcr/inspircd/inspircd.install +++ b/pcr/inspircd/inspircd.install @@ -5,7 +5,7 @@ post_install() { echo '==> You will need to create a config file for inspircd' echo '==> cp /etc/inspircd/inspircd.conf.example /etc/inspircd/inspircd.conf' echo '==> You will need to change the pidfile. To do this you can insert the following into your config.' - echo '==> ' + echo '==> ' echo '==> Remember to use absolute paths in your config directory and not relative paths like you would do with a user-based inspircd install.' } diff --git a/pcr/inspircd/inspircd.rcd b/pcr/inspircd/inspircd.rcd deleted file mode 100644 index 5dbd8198e..000000000 --- a/pcr/inspircd/inspircd.rcd +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/sbin/inspircd -} - -case "$1" in - start) - stat_busy "Starting inspircd" - PID=$(get_pid) - if [ -z "$PID" ]; then - su -s /bin/sh -c '/usr/sbin/inspircd --logfile /var/log/inspircd/startup.log --config /etc/inspircd/inspircd.conf' 'inspircd' > /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon inspircd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping inspircd" - PID=$(get_pid) - [ ! -z "$PID" ] && kill $PID - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon inspircd - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - - rehash|reload) - kill -HUP $(get_pid) - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -- cgit v1.2.3-2-g168b