Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=finit.git;a=commitdiff;h=7a838e709fa001668f2860c14b1468bca90e4a75
commit 7a838e709fa001668f2860c14b1468bca90e4a75 Author: crazy <[email protected]> Date: Mon May 8 01:48:16 2017 +0200 avahi-0.6.31-14-x86_64 * kill systemd diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index 78bae53..d467901 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -4,14 +4,13 @@ pkgname=avahi pkgver=0.6.31 -pkgrel=13 +pkgrel=14 pkgdesc="A multicast/unicast DNS-SD framework" archs=("x86_64") url="http://www.avahi.org"; groups=('network') -depends=('libssp>=6.2.1-5' 'gdbm>=1.12-2' 'libdaemon>=0.14-4' 'dbus>=1.10.10-3' 'libsystemd>=231-6' 'expat>=2.1.0-6') -makedepends=('systemd>=231-6') -rodepends=('shadow>=4.2.1-5') +depends=('libssp>=6.2.1-5' 'gdbm>=1.12-2' 'libdaemon>=0.14-4' 'dbus>=1.10.10-3' 'expat>=2.1.0-6' 'libelogind') +rodepends=('shadow>=4.2.1-5' 'elogind') makedepends=('intltool') backup=(etc/avahi/avahi-daemon.conf) conflicts=('mdnsresponder') @@ -19,33 +18,28 @@ replaces=('mdnsresponder') provides=('mdnsresponder') up2date="lynx -dump http://avahi.org/download/ | Flasttar" options=('scriptlet') -source=(http://avahi.org/download/$pkgname-$pkgver.tar.gz \ - README.Frugalware \ - ad.conf ) -_F_systemd_scriptlet="$pkgname.install" -_F_systemd_units=(avahi-daemon=e avahi-dnsconfd=e) -Finclude systemd python cross32 +source=(http://avahi.org/download/$pkgname-$pkgver.tar.gz README.Frugalware) +Finclude python cross32 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' \ - '3cb0c4904bc323cba78234e4c5430478636fbf44' \ - 'aaec0fbcd77facfefd3da4beca584a25ae0e6397') + '4210add6d818595008ba38b52fff8272372c15f8') subpkgs=("lib32-$pkgname") subdescs=("$pkgdesc (32-Bit)") -subdepends=("lib32-libssp lib32-gdbm lib32-libdaemon lib32-libdbus lib32-libsystemd lib32-expat") +subdepends=("lib32-libssp lib32-gdbm lib32-libdaemon lib32-libdbus lib32-expat lib32-libcap") subgroups=('lib32-extra') subarchs=("x86_64") subinstall=("") subpkgs+=("$pkgname-glib") subdescs+=('Glib bindings for Avahi') -subdepends+=("glib2>=2.50.0 libffi>=3.2.1-") +subdepends+=("glib2>=2.50.0 libffi>=3.2.1") subgroups+=('lib') subarchs+=("x86_64") subinstall+=("") subpkgs+=("lib32-$pkgname-glib") subdescs+=('Glib bindings for Avahi (32-Bit)') -subdepends+=("lib32-glib2>=2.50.0 lib32-libffi>=3.2.1-") +subdepends+=("lib32-glib2>=2.50.0 lib32-libffi>=3.2.1") subgroups+=('lib32-extra') subarchs+=("x86_64") subinstall+=("") @@ -94,7 +88,7 @@ Fconfopts+=" --disable-qt4 \ --enable-autoipd \ --with-autoipd-user=avahi \ --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system" + --with-systemdsystemunitdir=no" build() { @@ -149,17 +143,13 @@ build() { # avahi-dnsconfd Fsplit avahi-dnsconfd usr/sbin/avahi-dnsconfd - Fsplit avahi-dnsconfd lib/systemd/system/avahi-dnsconfd.service Fsplit avahi-dnsconfd etc/avahi/avahi-dnsconfd.action Fsplit avahi-dnsconfd usr/share/man/man8/avahi-dnsconfd* Fsplit lib32-$pkgname usr/lib32/ Fsplit lib32-$pkgname usr/i686-frugalware-linux/ - # fix for chroot.c: open() failed: No such file or directory - Ffile etc/systemd/system/avahi-daemon.service.d/ad.conf - Fgenscriptlet } # optimization OK diff --git a/source/network/avahi/README.Frugalware b/source/network/avahi/README.Frugalware index a5f0eb3..1ae5f05 100644 --- a/source/network/avahi/README.Frugalware +++ b/source/network/avahi/README.Frugalware @@ -12,5 +12,5 @@ Also, If you are using iptables, please uncomment this line in After that do not forget to restart iptables with: -------------------------- -# service firewall restart +# FIXME -------------------------- diff --git a/source/network/avahi/ad.conf b/source/network/avahi/ad.conf deleted file mode 100644 index 55b4beb..0000000 --- a/source/network/avahi/ad.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -After = systemd-resolved.service NetworkManager-wait-online.service diff --git a/source/network/avahi/avahi.install b/source/network/avahi/avahi.install index 1ffba74..0ce3fec 100644 --- a/source/network/avahi/avahi.install +++ b/source/network/avahi/avahi.install @@ -1,6 +1,3 @@ -sysvinit_units=(@_F_sysvinit_units@) -systemd_units=(@_F_systemd_units@) - post_install() { if ! grep -q 'avahi' /etc/group; then @@ -8,37 +5,11 @@ post_install() /usr/sbin/useradd -s /bin/false -c "Avahi daemon" -d / -u 84 -g avahi avahi 2>/dev/null fi - local unit - local op - - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - - for i in ${systemd_units[@]}; do - unit=$(echo $i | cut -f 1 -d '=') - op=$(echo $i | cut -f 2 -d '=') - if echo $op | grep -q 'e'; then - systemctl enable $unit.service >/dev/null 2>&1 - fi - if echo $op | grep -q 's'; then - systemctl start $unit.service >/dev/null 2>&1 - fi - done } post_upgrade() { - if ! grep -q 'avahi' /etc/group; then - /usr/sbin/groupadd -g 84 avahi 2>/dev/null - /usr/sbin/useradd -s /bin/false -c "Avahi daemon" -d / -u 84 -g avahi avahi 2>/dev/null - fi - - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - - systemctl daemon-reload >/dev/null 2>&1 + post_install } pre_remove() @@ -48,23 +19,8 @@ pre_remove() /usr/sbin/groupdel avahi 2>/dev/null fi - local unit - - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - - for i in ${systemd_units[@]}; do - unit=$(echo $i | cut -f 1 -d '=') - systemctl --no-reload disable $unit.service >/dev/null 2>&1 - systemctl stop $unit.service >/dev/null 2>&1 - done } -post_remove() -{ - systemctl daemon-reload >/dev/null 2>&1 -} op=$1 shift diff --git a/source/xapps/cups/cups.install b/source/xapps/cups/cups.install deleted file mode 100644 index d48c85c..0000000 --- a/source/xapps/cups/cups.install +++ /dev/null @@ -1,31 +0,0 @@ -# feel free to remove functions you don't need. comments, too - -post_upgrade() -{ - if [ -L /etc/systemd/system/printer.target.wants/cups.service ]; then - echo "CUPS changed service name of cups.service. Stopgging, reloading systemd and enabling new one" - systemctl stop cups.service - systemctl disable cups.service - systemctl daemon-reload - systemctl enable org.cups.cupsd.service - fi - - if [ -L /etc/systemd/system/sockets.target.wants/cups.socket ]; then - echo "CUPS changed service name of cups.socket. Stopgging, reloading systemd and enabling new one" - systemctl stop cups.socket - systemctl disable cups.socket - systemctl daemon-reload - systemctl enable org.cups.cupsd.socket - fi - if [ -L /etc/systemd/system/multi-user.target.wants/cups.path ]; then - echo "CUPS changed service name of cups.path. Stopgging, reloading systemd and enabling new one" - systemctl stop cups.path - systemctl disable cups.path - systemctl daemon-reload - systemctl enable org.cups.cupsd.path - fi -} - -op=$1 -shift -$op $* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
