diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2014-10-22 16:25:12 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2014-10-22 16:25:17 +0000 |
| commit | de1486968e25bae0492dcdfdb62428b31681f062 (patch) | |
| tree | 5b916abf83fc96731e2a00f130e3dd03ac90c789 /testing | |
| parent | f453e8a6a287df5bfc429cd244202e504522ede0 (diff) | |
| download | aports-de1486968e25bae0492dcdfdb62428b31681f062.tar.bz2 aports-de1486968e25bae0492dcdfdb62428b31681f062.tar.xz | |
testing/yadifa: removed yadifa user, fixed permissions and changed pidpath with pidfile in conf
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/yadifa/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/yadifa/yadifa.confd | 8 | ||||
| -rwxr-xr-x | testing/yadifa/yadifa.post-install | 13 | ||||
| -rwxr-xr-x | testing/yadifa/yadifa.pre-install | 4 |
4 files changed, 17 insertions, 25 deletions
diff --git a/testing/yadifa/APKBUILD b/testing/yadifa/APKBUILD index 0a0ebb9b5d..3ec80c9e0b 100644 --- a/testing/yadifa/APKBUILD +++ b/testing/yadifa/APKBUILD @@ -11,10 +11,8 @@ license="BSD-3" depends="openssl" depends_dev="openssl-dev" makedepends="$depends_dev" -install="$pkgname.pre-install $pkgname.post-install" +install="$pkgname.post-install" options="libtool" -pkgusers="yadifa" -pkggroups="yadifa" subpackages="$pkgname-dev $pkgname-doc" source="http://cdn.yadifa.eu/sites/default/files/releases/$pkgname-$pkgver-$_buildnr.tgz poll-h.patch @@ -43,10 +41,9 @@ build() { --build=$CBUILD \ --host=$CHOST \ --sysconfdir=/etc/$pkgname \ - --localstatedir=/var \ + --localstatedir=/var/yadifa \ --enable-dynamic-provisioning \ --enable-rrl - make } @@ -57,22 +54,20 @@ package() { install -D -m 0755 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname install -D -m 0755 etc/*.example "$pkgdir"/etc/$pkgname cp etc/yadifad.conf "$pkgdir"/etc/$pkgname - mkdir -p "$pkgdir"/var/$pkgname + mkdir -p "$pkgdir"/var/run/$pkgname mkdir -p "$pkgdir"/var/log/$pkgname - chown $pkgusers:$pkggroups "$pkgdir"/var/$pkgname - chown $pkgusers:$pkggroups "$pkgdir"/var/log/$pkgname rm -f "$pkgdir"/usr/lib/*.la } md5sums="8bb0cd24c3bea7ea7f503ca523b8a13b yadifa-2.0.0-4192.tgz bb9b9e01e8781949381bc1d6e24076ea poll-h.patch a368b39c128dfea18d16b61df8b0f069 yadifa.initd -054dc6c7d4e5c8d81610825c0875efd2 yadifa.confd" +945d33adae1a7870782442df70a79142 yadifa.confd" sha256sums="ef98afcfa544474c6634a3177af402fc37453dd3244c084bc9e4b323997ef61c yadifa-2.0.0-4192.tgz 250910b256cf0193ffa74fdae3a22d6cfc6834bd6f751ad9dcf331c43d5a6c0a poll-h.patch 0e3a165692bd4ff2ea1104a3565c0cbd8ec8896b10e3aa6d6acd7c6a7b357ac1 yadifa.initd -c1a1b5535858ce569197196f94c5a2f13ed2f003d68be06475c765ff82e74c22 yadifa.confd" +e06a32d9efdd618c402891fa7aa6465350e6d51b85cdd7457410ff39ed678777 yadifa.confd" sha512sums="a476ab13d25763bd5c53e140243eb6b1524c31ea6b6361196fd68d08d07683b009d9b76c579149815a9d7e887edc6e1edef90436330b37cad301ab3249728aba yadifa-2.0.0-4192.tgz a72c0a296de2a0a8ab4b6836cbf364be0c2b2854d1f7c2a151d015902b55b0766c61466a18f4e904e82e40776ba88b8ce0b61f218799ad9d8d779f63aa9610d6 poll-h.patch 905e3f9efc07864c6aa4ca09c41f253b87094d06cc98942f3cab2c3fd34de2795d8f358359a194e8f2913201387c5d8e6f1ceebf2f4ef98b043868c002e65ec3 yadifa.initd -10c8e6e9cfcf8671de541fc2a8f56ea6756d8da1e96262efc26daa4be22aec5f51037d6cbbfa90b826521145f0b41dcc9e515e343ef1ff72a9bf213dc2f90f58 yadifa.confd" +3136e089d7f8864a568686a0911a162bfe763dfb40061f4b96a37320cd0538a4213759c786e2a80b355c6344cd0a88e7492c21a03af70ed1a6f66255626b6226 yadifa.confd" diff --git a/testing/yadifa/yadifa.confd b/testing/yadifa/yadifa.confd index 6a48c831b6..5ad10b114b 100644 --- a/testing/yadifa/yadifa.confd +++ b/testing/yadifa/yadifa.confd @@ -1,4 +1,4 @@ -SVCBIN=/usr/sbin/yadifad -CONFFILE=/etc/yadifa/yadifad.conf -PIDFILE=/var/run/yadifad.pid -YADIFA_OPTS="-u yadifa -g yadifa" +SVCBIN="/usr/sbin/yadifad" +CONFFILE="/etc/yadifa/yadifad.conf" +PIDFILE="/var/run/yadifa/yadifad.pid" +YADIFA_OPTS="" diff --git a/testing/yadifa/yadifa.post-install b/testing/yadifa/yadifa.post-install index 7b614a60ae..24dc52af71 100755 --- a/testing/yadifa/yadifa.post-install +++ b/testing/yadifa/yadifa.post-install @@ -1,8 +1,9 @@ #!/bin/sh -sed -i -e "s/daemon.*/daemon\ton/" /etc/yadifa/yadifad.conf >&2 -sed -i -e "s/logpath.*/logpath\t\t\"\/var\/log\/yadifa\"/" /etc/yadifa/yadifad.conf >&2 -sed -i -e "s/pidpath.*/pidpath\t\t\"\/var\/run\"/" /etc/yadifa/yadifad.conf >&2 -sed -i -e "s/chroot.*/chroot\ton/" /etc/yadifa/yadifad.conf >&2 -sed -i -e "s/uid.*/uid\tyadifa/" /etc/yadifa/yadifad.conf >&2 -sed -i -e "s/gid.*/gid\tyadifa/" /etc/yadifa/yadifad.conf >&2 +#sed -i -e "s/daemon.*/daemon\ton/" /etc/yadifa/yadifad.conf >&2 +#sed -i -e "s/logpath.*/logpath\t\t\"\/var\/log\/yadifa\"/" /etc/yadifa/yadifad.conf >&2 +#sed -i -e "s/pidpath.*/pidfile\t\t\"\/var\/run\/yadifa\"/" /etc/yadifa/yadifad.conf >&2 + +sed -i -e "s/daemon.*/daemon\ton/" yadifad.conf >&2 +sed -i -e "s/logpath.*/logpath\t\t\"\/var\/log\/yadifa\"/" yadifad.conf >&2 +sed -i -e "s/pidpath.*/pidfile\t\t\"\/var\/run\/yadifa\"/" yadifad.conf >&2 exit 0 diff --git a/testing/yadifa/yadifa.pre-install b/testing/yadifa/yadifa.pre-install deleted file mode 100755 index cecfe61aec..0000000000 --- a/testing/yadifa/yadifa.pre-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -addgroup yadifa 2>/dev/null -adduser -h /var/yadifa -s /sbin/nologin -S -D yadifa -G yadifa 2>/dev/null -exit 0 |