From 66cb4a487ad73063c6b000279a5d5558fb7603f5 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 May 2013 01:16:28 -0700 Subject: Mon May 13 01:16:27 PDT 2013 --- community/aiccu/01-fix-makefile.patch | 39 +++++++++++++++++++++++++++++++++ community/aiccu/01-no-init-script.patch | 17 -------------- community/aiccu/PKGBUILD | 24 ++++++++++---------- community/aiccu/aiccu.service | 4 ++-- 4 files changed, 53 insertions(+), 31 deletions(-) create mode 100644 community/aiccu/01-fix-makefile.patch delete mode 100644 community/aiccu/01-no-init-script.patch (limited to 'community/aiccu') diff --git a/community/aiccu/01-fix-makefile.patch b/community/aiccu/01-fix-makefile.patch new file mode 100644 index 000000000..211df7a6a --- /dev/null +++ b/community/aiccu/01-fix-makefile.patch @@ -0,0 +1,39 @@ +--- a/Makefile 2007-01-11 01:29:33.000000000 +0100 ++++ b/Makefile 2013-05-12 23:38:17.171000000 +0200 +@@ -17,9 +17,9 @@ + PROJECT_VERSION=$(shell grep "AICCU_VER" common/aiccu.h | head -n 1 | awk '{print $$3}' | tr -d \") + + # Misc bins +-RM=@rm -f +-MAKE:=@${MAKE} +-CP=@echo [Copy]; cp ++RM=rm -f ++MAKE:=${MAKE} ++CP=cp + RPMBUILD=@echo [RPMBUILD]; rpmbuild + RPMBUILD_SILENCE=>/dev/null 2>/dev/null + +@@ -78,21 +78,11 @@ + @mkdir -p ${DESTDIR}${dirdoc} + @echo "Configuration..." + @mkdir -p ${DESTDIR}${diretc} +-ifeq ($(shell echo "A${RPM_BUILD_ROOT}"),A) +- $(shell [ -f ${DESTDIR}${diretc}${PROJECT}.conf ] || cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf) ++ @cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf + @echo "Documentation..." + @cp doc/README ${DESTDIR}${dirdoc} +- @cp doc/LICENSE ${DESTDIR}${dirdoc} ++ @cp doc/changelog ${DESTDIR}${dirdoc} + @cp doc/HOWTO ${DESTDIR}${dirdoc} +- @echo "Installing Debian-style init.d" +- @mkdir -p ${DESTDIR}${diretc}init.d +- @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} +-else +- @echo "Installing Redhat-style init.d" +- @mkdir -p ${DESTDIR}${diretc}init.d +- @cp doc/${PROJECT}.init.rpm ${DESTDIR}${diretc}init.d/${PROJECT} +- @cp doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf +-endif + @echo "Installation into ${DESTDIR}/ completed" + + help: diff --git a/community/aiccu/01-no-init-script.patch b/community/aiccu/01-no-init-script.patch deleted file mode 100644 index 930d5d21a..000000000 --- a/community/aiccu/01-no-init-script.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: aiccu-20070115/Makefile -=================================================================== ---- aiccu-20070115.orig/Makefile 2009-10-25 22:25:45.000000000 +0100 -+++ aiccu-20070115/Makefile 2009-10-25 22:25:58.000000000 +0100 -@@ -84,9 +84,9 @@ - @cp doc/README ${DESTDIR}${dirdoc} - @cp doc/LICENSE ${DESTDIR}${dirdoc} - @cp doc/HOWTO ${DESTDIR}${dirdoc} -- @echo "Installing Debian-style init.d" -- @mkdir -p ${DESTDIR}${diretc}init.d -- @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} -+# @echo "Installing Debian-style init.d" -+# @mkdir -p ${DESTDIR}${diretc}init.d -+# @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} - else - @echo "Installing Redhat-style init.d" - @mkdir -p ${DESTDIR}${diretc}init.d diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD index 118210c38..801c28866 100644 --- a/community/aiccu/PKGBUILD +++ b/community/aiccu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84114 2013-02-10 18:32:51Z seblu $ +# $Id: PKGBUILD 90477 2013-05-12 21:46:51Z seblu $ # Maintainer: Sébastien Luttringer pkgname=aiccu pkgver=20070115 -pkgrel=2 +pkgrel=3 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility' arch=('i686' 'x86_64') url='http://www.sixxs.net/tools/aiccu/' @@ -12,40 +12,40 @@ depends=('gnutls' 'iproute2') backup=('etc/aiccu.conf') source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz" 'aiccu.service' - '01-no-init-script.patch' + '01-fix-makefile.patch' '02-allow-tunnels.patch' '03-no-quiet-gcc.patch' '04-skip-strip.patch' '05-spelling-error.patch' '06-setup-script.patch') md5sums=('c9bcc83644ed788e22a7c3f3d4021350' - 'e038c9d7882e6e603d87962bac7a0f2a' - '6de05338752bfb01772dee37b1dc0454' + '891b0fa527c1b847ce803dac047cf80d' + '7c7c563ecc6d3fa64a7766de28ba1927' 'b9b2c0e7186f3f96366caaa39252dccc' 'b38db1d95760cd9687330b7db5f4ea1d' '6dfa2df27bb4859c7511bfea91337925' '21a37c376ebfcf787c0e7ee8552053ac' '98e73756609f4e09c45c4e5139fd5aed') -build() { +prepare() { cd $pkgname for _p in "$srcdir"/*.patch; do patch -p1 -i "$_p" done +} + +build() { + cd $pkgname [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed" make } package() { cd $pkgname - make DESTDIR="$pkgdir" install - # default config - install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf" + make DESTDIR="$pkgdir" dirsbin="/usr/bin/" install # license install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - # doc - install -dm755 "$pkgdir/usr/share/doc/$pkgname" - install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname/" + # man install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" # systemd install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service" diff --git a/community/aiccu/aiccu.service b/community/aiccu/aiccu.service index 7371b2849..23f562ea0 100644 --- a/community/aiccu/aiccu.service +++ b/community/aiccu/aiccu.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking PIDFile=/var/run/aiccu.pid -ExecStart=/usr/sbin/aiccu start -ExecStop=/usr/sbin/aiccu stop +ExecStart=/usr/bin/aiccu start +ExecStop=/usr/bin/aiccu stop [Install] WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf