mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-vpn/aiccu: Remove last-rited pkg
Closes: https://bugs.gentoo.org/670678 Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1 +0,0 @@
|
||||
DIST aiccu_20070115.tar.gz 70056 BLAKE2B 6eac12e3f26f5a2765f195805d23909dd4b9f506e0307855fdb4008b9a9d452ad819415b932f3461fb8aa695cf60bbda4bc642607992d9dc3a69b569693d97d3 SHA512 15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78
|
||||
@@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils linux-info systemd toolchain-funcs
|
||||
|
||||
DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS"
|
||||
HOMEPAGE="https://www.sixxs.net/tools/aiccu"
|
||||
SRC_URI="https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_${PV//\./}.tar.gz"
|
||||
|
||||
LICENSE="SixXS"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm hppa ppc sparc x86"
|
||||
IUSE="systemd"
|
||||
|
||||
RDEPEND="
|
||||
net-libs/gnutls
|
||||
sys-apps/iproute2
|
||||
systemd? ( sys-apps/systemd )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
CONFIG_CHECK="~TUN"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-r2-init.gentoo.patch \
|
||||
"${FILESDIR}"/${P}-Makefile.patch \
|
||||
"${FILESDIR}"/${P}-setupscript.patch \
|
||||
"${FILESDIR}"/${P}-uclibc.patch \
|
||||
"${FILESDIR}"/${P}-systemd.patch \
|
||||
"${FILESDIR}"/${P}-gnutls-3.4.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Don't use main Makefile since it requires additional
|
||||
# dependencies which are useless for us.
|
||||
emake CC=$(tc-getCC) STRIP= -C unix-console \
|
||||
HAVE_SYSTEMD=$(usex systemd 1 0)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin unix-console/${PN}
|
||||
|
||||
insopts -m 600
|
||||
insinto /etc
|
||||
doins doc/${PN}.conf
|
||||
newinitd doc/${PN}.init.gentoo ${PN}
|
||||
|
||||
use systemd && systemd_dounit doc/${PN}.service
|
||||
|
||||
dodoc doc/{HOWTO,README,changelog}
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
--- unix-console/Makefile.old 2010-06-28 21:56:32.287782600 +0200
|
||||
+++ unix-console/Makefile 2010-06-28 22:15:56.232637681 +0200
|
||||
@@ -25,14 +25,11 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar
|
||||
# CWARNS += -Wpacked
|
||||
|
||||
#CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
|
||||
-CFLAGS += $(CWARNS) -D_GNU_SOURCE
|
||||
+CFLAGS ?= $(CWARNS) -O3
|
||||
+CFLAGS += -D_GNU_SOURCE
|
||||
CC = @gcc
|
||||
RM = rm
|
||||
-
|
||||
-# Add -O3 when nothing is specified yet
|
||||
-ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0)
|
||||
-CFLAGS += -O3
|
||||
-endif
|
||||
+STRIP = strip
|
||||
|
||||
# This is a console client
|
||||
CFLAGS += -D AICCU_CONSOLE
|
||||
@@ -42,7 +39,7 @@ CFLAGS += -D AICCU_CONSOLE
|
||||
# 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 +47,7 @@ ifeq ($(shell uname | grep -c "Linux"),1
|
||||
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
|
||||
@@ -118,7 +115,7 @@ ifeq ($(shell uname | grep -c "Darwin"),
|
||||
CFLAGS += -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
|
||||
SRCS += ../common/aiccu_darwin.c
|
||||
OBJS += ../common/aiccu_darwin.o
|
||||
-LDFLAGS += -lresolv
|
||||
+LIBS += -lresolv
|
||||
endif
|
||||
|
||||
# SunOS / Solaris
|
||||
@@ -126,7 +123,7 @@ ifeq ($(shell uname | grep -c "SunOS"),1
|
||||
CFLAGS += -D_SUNOS -D AICCU_TYPE="\"sunos\""
|
||||
SRCS += ../common/aiccu_sunos.c
|
||||
OBJS += ../common/aiccu_sunos.o
|
||||
-LDFLAGS += -lsocket -lnsl -lresolv
|
||||
+LIBS += -lsocket -lnsl -lresolv
|
||||
endif
|
||||
|
||||
# AIX
|
||||
@@ -137,17 +134,19 @@ CFLAGS += -D AICCU_CONSOLE
|
||||
CFLAGS += -D_AIX -D AICCU_TYPE="\"aix\""
|
||||
SRCS += ../common/aiccu_aix.c
|
||||
OBJS += ../common/aiccu_aix.o
|
||||
-LDFLAGS += -lpthread
|
||||
+LIBS += -lpthread
|
||||
endif
|
||||
|
||||
|
||||
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 $@
|
||||
+ifdef STRIP
|
||||
+ $(STRIP) $@
|
||||
+endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
from http://git.alpinelinux.org/cgit/aports/tree/main/aiccu
|
||||
|
||||
--- 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);
|
||||
@@ -1,33 +0,0 @@
|
||||
--- aiccu/doc/aiccu.init.gentoo
|
||||
+++ aiccu/doc/aiccu.init.gentoo
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
depend() {
|
||||
need net
|
||||
- after ntp-client
|
||||
+ after ntp-client ntpd
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
@@ -23,14 +23,19 @@
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Starting aiccu"
|
||||
- start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/aiccu -- start
|
||||
+ start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start
|
||||
eend $?
|
||||
}
|
||||
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping aiccu"
|
||||
- start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/aiccu -- stop
|
||||
+ start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop
|
||||
eend $?
|
||||
}
|
||||
|
||||
+restart() {
|
||||
+ stop
|
||||
+ sleep 3
|
||||
+ start
|
||||
+}
|
||||
@@ -1,17 +0,0 @@
|
||||
--- aiccu/unix-console/main.c
|
||||
+++ aiccu/unix-console/main.c
|
||||
@@ -471,6 +471,14 @@
|
||||
*/
|
||||
if (aiccu_setup(hTunnel, true))
|
||||
{
|
||||
+
|
||||
+ /* Running setup script */
|
||||
+ if (g_aiccu->setupscript)
|
||||
+ {
|
||||
+ aiccu_exec("%s", g_aiccu->setupscript);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
/* We need to stay running when doing Heartbeat or AYIYA */
|
||||
if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
|
||||
strcasecmp(hTunnel->sType, "ayiya") == 0)
|
||||
@@ -1,52 +0,0 @@
|
||||
--- /dev/null
|
||||
+++ aiccu-2007.01.15/doc/aiccu.service
|
||||
@@ -0,0 +1,13 @@
|
||||
+[Unit]
|
||||
+Description=Automatic IPv6 Connectivity Client Utility
|
||||
+After=time-sync.target network.target
|
||||
+ConditionPathExists=/etc/aiccu.conf
|
||||
+
|
||||
+
|
||||
+[Service]
|
||||
+Type=notify
|
||||
+ExecStart=/usr/sbin/aiccu start
|
||||
+ExecStop=/usr/sbin/aiccu stop
|
||||
+
|
||||
+[Install]
|
||||
+WantedBy=multi-user.target
|
||||
--- aiccu-2007.01.15/unix-console/Makefile
|
||||
+++ aiccu-2007.01.15/unix-console/Makefile
|
||||
@@ -48,6 +48,10 @@ ifeq ($(shell uname | grep -c "Linux"),1)
|
||||
SRCS += ../common/aiccu_linux.c
|
||||
OBJS += ../common/aiccu_linux.o
|
||||
LIBS += -lpthread -lresolv
|
||||
+ifeq (1,$(HAVE_SYSTEMD))
|
||||
+LIBS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon)
|
||||
+CFLAGS += -DHAVE_SYSTEMD
|
||||
+endif
|
||||
endif
|
||||
|
||||
# FreeBSD
|
||||
--- aiccu-2007.01.15/unix-console/main.c
|
||||
+++ aiccu-2007.01.15/unix-console/main.c
|
||||
@@ -12,6 +12,9 @@
|
||||
|
||||
#include "../common/aiccu.h"
|
||||
#include "../common/tun.h"
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+#include <systemd/sd-daemon.h>
|
||||
+#endif
|
||||
|
||||
#ifndef _WIN32
|
||||
/* Enable/Disable heartbeating */
|
||||
@@ -478,6 +481,10 @@ int main(int argc, char *argv[])
|
||||
aiccu_exec("%s", g_aiccu->setupscript);
|
||||
}
|
||||
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+ /* Tell systemd we are operational. */
|
||||
+ sd_notify(0, "READY=1");
|
||||
+#endif
|
||||
|
||||
/* We need to stay running when doing Heartbeat or AYIYA */
|
||||
if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
|
||||
@@ -1,29 +0,0 @@
|
||||
--- aiccu/common/resolver.c
|
||||
+++ aiccu/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
|
||||
+#if defined(_LINUX) && ! defined(__UCLIBC__)
|
||||
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
|
||||
+#if defined(_LINUX) && ! defined(__UCLIBC__)
|
||||
memset(&res, 0, sizeof(res));
|
||||
res.options = RES_DEBUG;
|
||||
res_ninit(&res);
|
||||
@@ -47,7 +47,7 @@
|
||||
#endif
|
||||
|
||||
memset(answer, 0, sizeof(answer));
|
||||
-#ifdef _LINUX
|
||||
+#if defined(_LINUX) && ! defined(__UCLIBC__)
|
||||
ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
|
||||
#else
|
||||
ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
@@ -591,11 +591,6 @@ x11-wm/afterstep
|
||||
# Removal in 30 days. Bug #459490.
|
||||
games-roguelike/rogue
|
||||
|
||||
# Michał Górny <mgorny@gentoo.org> (22 Mar 2019)
|
||||
# SixXS has been discontinued, rendering the package defunct.
|
||||
# Removal in 30 days. Bug #670678.
|
||||
net-vpn/aiccu
|
||||
|
||||
# Miroslav Šulc <fordfrog@gentoo.org> (19 Mar 2019)
|
||||
# Depends on >=virtual/{jdk,jre}-11 which is masked
|
||||
=www-servers/tomcat-9.0.17
|
||||
|
||||
@@ -21,7 +21,6 @@ move net-misc/vtun net-vpn/vtun
|
||||
move net-misc/isatapd net-vpn/isatapd
|
||||
move net-misc/iodine net-vpn/iodine
|
||||
move net-misc/corkscrew net-vpn/corkscrew
|
||||
move net-misc/aiccu net-vpn/aiccu
|
||||
move net-misc/httptunnel net-vpn/httptunnel
|
||||
move net-misc/nstx net-vpn/nstx
|
||||
move net-misc/6tunnel net-vpn/6tunnel
|
||||
|
||||
Reference in New Issue
Block a user