diff options
| -rw-r--r-- | main/aiccu/APKBUILD | 58 | ||||
| -rw-r--r-- | main/aiccu/aiccu.initd | 40 | ||||
| -rw-r--r-- | main/aiccu/fix_linking.patch | 29 | ||||
| -rw-r--r-- | main/aiccu/gnutls-3.4.0.patch | 20 | ||||
| -rw-r--r-- | main/aiccu/musl_does_not_have_res_ninit.patch | 29 |
5 files changed, 0 insertions, 176 deletions
diff --git a/main/aiccu/APKBUILD b/main/aiccu/APKBUILD deleted file mode 100644 index 0be1074e49..0000000000 --- a/main/aiccu/APKBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Contributor: <xmingske@gmail.com> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=aiccu -pkgver=20070115 -pkgrel=3 -pkgdesc="Automatic IPv6 Connectivity Client Utility" -url="https://www.sixxs.net/" -arch="all" -license="SixXS" -depends="iproute2" -makedepends="gnutls-dev linux-headers" -source="https://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz - musl_does_not_have_res_ninit.patch - fix_linking.patch - gnutls-3.4.0.patch - aiccu.initd - " -subpackages="${pkgname}-doc" - -_builddir="$srcdir"/${pkgname} - -prepare() { - local pf - cd "${_builddir}" - for pf in ${srcdir}/*.patch; do - patch -p1 -i ${pf} || return 1 - done -} - -build() { - cd "${_builddir}" - make -C unix-console HAVE_SYSTEMD=0 || return 1 -} - -package() { - cd "${_builddir}" - install -D -m0755 "${_builddir}"/unix-console/aiccu ${pkgdir}/usr/sbin/aiccu || return 1 - install -D -m0755 "${srcdir}"/aiccu.initd ${pkgdir}/etc/init.d/aiccu || return 1 - install -D -m0644 "${_builddir}"/doc/aiccu.conf ${pkgdir}/etc/aiccu.conf || return 1 - install -D -m0644 "${_builddir}"/doc/HOWTO ${pkgdir}/usr/share/doc/aiccu/HOWTO || return 1 - install -D -m0644 "${_builddir}"/doc/README ${pkgdir}/usr/share/doc/aiccu/README || return 1 - install -D -m0644 "${_builddir}"/doc/changelog ${pkgdir}/usr/share/doc/aiccu/changelog || return 1 -} -md5sums="c9bcc83644ed788e22a7c3f3d4021350 aiccu_20070115.tar.gz -54a0045d766a1f0696c46800a39a8d92 musl_does_not_have_res_ninit.patch -cb9060144aa68e3e2be394427a10f39f fix_linking.patch -592de37319b62e6a85129735a5dab564 gnutls-3.4.0.patch -ea69e2ba73bde0229c26a39f0d80e61a aiccu.initd" -sha256sums="2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760 aiccu_20070115.tar.gz -f748e1df9ec8381709d983f60282c9dde839bd00eb3db551e45578e155e6772c musl_does_not_have_res_ninit.patch -df7820a873e720badefe6bc71b658ce8e0c1c5ac2c16f04e5174f3a7d27b5053 fix_linking.patch -babc7016d964510df33e006ec806384a205f4385ee5c228296a4e4e139a423da gnutls-3.4.0.patch -4c2687699b7e50d48ba3fe5eb42acbb5cd769edd80adac19e2c2f2cf468ad774 aiccu.initd" -sha512sums="15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78 aiccu_20070115.tar.gz -a13a112eb8bffe125cff9452f9643d516ba4d7168c23e2e15280da9c21e7fa373b8f40cbbf52d353a556820db6b528309055b3a67efc4366e914e4d8e0717aec musl_does_not_have_res_ninit.patch -c131ec6d79caa38d315ac938718d0752c62dee148fe7200eb7ea908d2911ff2e99814505552207b676f0a6e25e36d3ecaa9e4ada59310e150cc3faa603662821 fix_linking.patch -f127cf5ba3a2e636fb1ef412a4a00ba4c02ad14cdd1fb1ffe09c5b68e627a6acafad6992ff18de2eede39ace8717a6fccddeb8cf0311b13927d1a69e7a6dd14a gnutls-3.4.0.patch -57bf05b69b404b0cefc7c9c8dfc1de670c5eb70b5b47570c20e4306734c361f217330f0ce891df5f83085d1b76d2e6436b890165b74cf0323c5a2341c0739128 aiccu.initd" diff --git a/main/aiccu/aiccu.initd b/main/aiccu/aiccu.initd deleted file mode 100644 index 4a3e07dee1..0000000000 --- a/main/aiccu/aiccu.initd +++ /dev/null @@ -1,40 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net - after ntpd -} - -checkconfig() { - # Verify that the configuration file exists - if [ ! -f /etc/aiccu.conf ]; then - eerror "AICCU Configuration file /etc/aiccu.conf doesn't exist" - return 1 - fi - - # Verify that the configuration is correct - if [ `grep -c "^username" /etc/aiccu.conf 2>/dev/null` -ne 1 ]; then - eerror "AICCU is not configured, edit /etc/aiccu.conf first" - return 1 - fi -} - - -start() { - checkconfig || return 1 - ebegin "Starting aiccu" - start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start - eend $? -} - -stop() { - ebegin "Stopping aiccu" - start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop - eend $? -} - -restart() { - stop - sleep 3 - start -} diff --git a/main/aiccu/fix_linking.patch b/main/aiccu/fix_linking.patch deleted file mode 100644 index 100220149b..0000000000 --- a/main/aiccu/fix_linking.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/unix-console/Makefile -+++ b/unix-console/Makefile -@@ -42,7 +42,7 @@ - # Currently defaultly builds only on Linux, but other platforms might easily also support it - ifeq ($(shell uname | grep -c "Linux"),1) - CFLAGS += -D AICCU_GNUTLS --LDFLAGS += -lgnutls -+LIBS += -lgnutls - endif - - # Linux -@@ -50,7 +50,7 @@ - CFLAGS += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\"" - SRCS += ../common/aiccu_linux.c - OBJS += ../common/aiccu_linux.o --LDFLAGS += -lpthread -lresolv -+LIBS += -lpthread -lresolv - endif - - # FreeBSD -@@ -144,7 +144,7 @@ - all: aiccu - - aiccu: $(OBJS) ${SRCS} ${INCS} -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) - ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1) - strip $@ diff --git a/main/aiccu/gnutls-3.4.0.patch b/main/aiccu/gnutls-3.4.0.patch deleted file mode 100644 index 8eb1e4fa69..0000000000 --- a/main/aiccu/gnutls-3.4.0.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- aiccu/common/common.c 2015-04-17 23:08:32.543680010 +0200 -+++ aiccu/common/common.c.new 2015-04-17 23:14:02.152457972 +0200 -@@ -272,7 +272,6 @@ - { - #ifdef AICCU_GNUTLS - /* Allow connections to servers that have OpenPGP keys as well */ -- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; - int ret; - #endif /* AICCU_GNUTLS*/ - -@@ -300,8 +299,7 @@ - gnutls_set_default_priority(sock->session); - /* XXX: Return value is not documented in GNUTLS documentation! */ - -- gnutls_certificate_type_set_priority(sock->session, cert_type_priority); -- /* XXX: Return value is not documented in GNUTLS documentation! */ -+ gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL); - - /* Configure the x509 credentials for the current session */ - gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred); diff --git a/main/aiccu/musl_does_not_have_res_ninit.patch b/main/aiccu/musl_does_not_have_res_ninit.patch deleted file mode 100644 index 1934afbc50..0000000000 --- a/main/aiccu/musl_does_not_have_res_ninit.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- aiccu/common/resolver.c -+++ aiccu.new/common/resolver.c -@@ -26,7 +26,7 @@ - - int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record)) - { --#ifdef _LINUX -+#ifdef __GLIBC__ - struct __res_state res; - #endif - unsigned char answer[8192]; -@@ -38,7 +38,7 @@ - uint16_t type = 0, class = 0; - uint32_t ttl = 0; - --#ifdef _LINUX -+#ifdef __GLIBC__ - memset(&res, 0, sizeof(res)); - res.options = RES_DEBUG; - res_ninit(&res); -@@ -47,7 +47,7 @@ - #endif - - memset(answer, 0, sizeof(answer)); --#ifdef _LINUX -+#ifdef __GLIBC__ - ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer)); - #else - ret = res_query(label, C_IN, rrtype, answer, sizeof(answer)); |