git: aec8e727fe38 - main - cleanup: Remove expired ports:
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 27 Oct 2021 20:41:27 UTC
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=aec8e727fe38bebd499738870fa814b7cf8be533 commit aec8e727fe38bebd499738870fa814b7cf8be533 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2021-10-27 20:41:10 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2021-10-27 20:41:10 +0000 cleanup: Remove expired ports: 2021-10-27 emulators/vpcs: Upstream unmaintained 2021-10-27 devel/google-gdata: Google is no longer using GoogleData APIs 2021-10-27 net/irrd-legacy: Use net/irrd --- MOVED | 3 + devel/Makefile | 1 - devel/google-gdata/Makefile | 38 ---------- devel/google-gdata/distinfo | 5 -- devel/google-gdata/files/patch-Makefile | 44 ------------ .../files/patch-src_gapps_auditservice.cs | 10 --- devel/google-gdata/pkg-descr | 4 -- emulators/Makefile | 1 - emulators/vpcs/Makefile | 36 ---------- emulators/vpcs/distinfo | 2 - emulators/vpcs/pkg-descr | 12 ---- net/Makefile | 1 - net/irrd-legacy/Makefile | 81 ---------------------- net/irrd-legacy/distinfo | 3 - net/irrd-legacy/files/irrd.in | 27 -------- net/irrd-legacy/files/patch-configure | 19 ----- .../files/patch-lib_config_config__file.c | 11 --- net/irrd-legacy/files/patch-lib_mrt_prefix.c | 21 ------ .../files/patch-programs_IRRd_database.c | 16 ----- .../files/patch-programs_IRRd_uii__commands.c | 55 --------------- net/irrd-legacy/pkg-descr | 3 - 21 files changed, 3 insertions(+), 390 deletions(-) diff --git a/MOVED b/MOVED index e1ee46c63597..e402c225a80a 100644 --- a/MOVED +++ b/MOVED @@ -16581,3 +16581,6 @@ textproc/rubygem-compass||2021-10-25|Compass is no longer supported since August textproc/rubygem-compass-core||2021-10-25|Compass is no longer supported since August 4, 2016 textproc/rubygem-compass-import-once||2021-10-25|Compass is no longer supported since August 4, 2016 textproc/rubygem-compass-blueprint||2021-10-25|Depend on unsupported textproc/rubygem-compass +emulators/vpcs||2021-10-27|Has expired: Upstream unmaintained +devel/google-gdata||2021-10-27|Has expired: Google is no longer using GoogleData APIs +net/irrd-legacy|net/irrd|2021-10-27|Has expired: Use net/irrd diff --git a/devel/Makefile b/devel/Makefile index 19427829f00a..f17f1b1eb886 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -899,7 +899,6 @@ SUBDIR += golint SUBDIR += google-cloud-cpp SUBDIR += google-cloud-cpp117 - SUBDIR += google-gdata SUBDIR += google-perftools SUBDIR += google-styleguide SUBDIR += googletest diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile deleted file mode 100644 index d8565743cf48..000000000000 --- a/devel/google-gdata/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Created by: Romain Tartiere <romain@FreeBSD.org> - -PORTNAME= google-gdata -PORTVERSION= 2.2.0.0.20150610 -CATEGORIES= devel - -MAINTAINER= bofh@FreeBSD.org -COMMENT= DOT NET library for the Google Data API - -LICENSE= APACHE20 - -DEPRECATED= Google is no longer using GoogleData APIs -EXPIRATION_DATE=2021-10-27 - -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:devel/newtonsoft-json -NUGET_DEPENDS= nunit.framework=2.63.0 - -USES= dos2unix gmake mono:nuget pathfix -USE_GITHUB= yes - -GH_ACCOUNT= google -GH_TAGNAME= b716bbc - -NUGET_LAYOUT= flat -PATHFIX_MAKEFILEIN= Makefile -WRKSRC_SUBDIR= clients/cs -DOS2UNIX_FILES= ${WRKSRC}/Makefile ${WRKSRC}/misc/gdata-sharp-core.pc.in -MAKE_ARGS= CSC=${LOCALBASE}/bin/csc SN=${LOCALBASE}/bin/sn -NO_ARCH= yes - -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -Ee 's|(-keyfile:(.*))|\1 -delaysign+\'$$'\n'$$'\t''$$(SN) -R $$@ \2|g' ${WRKSRC}/Makefile - -post-install: - cd ${STAGEDIR}${PREFIX}; ${FIND} lib/mono libdata/pkgconfig \ - \( -type f -or -type l \) | ${SORT} >> ${TMPPLIST} - -.include <bsd.port.mk> diff --git a/devel/google-gdata/distinfo b/devel/google-gdata/distinfo deleted file mode 100644 index 6b71a9a2e665..000000000000 --- a/devel/google-gdata/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1587167239 -SHA256 (nunit.framework.2.63.0.nupkg) = 582afa06ff95f9e435b7e54d993772ef7affaf5d7d09c97bda062793d1cee829 -SIZE (nunit.framework.2.63.0.nupkg) = 105659 -SHA256 (google-google-gdata-2.2.0.0.20150610-b716bbc_GH0.tar.gz) = 0f50c6657bfc938d40d7ebe2fb706fb2afcc3aa976c8314e46e0df864ff40d04 -SIZE (google-google-gdata-2.2.0.0.20150610-b716bbc_GH0.tar.gz) = 56544271 diff --git a/devel/google-gdata/files/patch-Makefile b/devel/google-gdata/files/patch-Makefile deleted file mode 100644 index 4eacb71697d0..000000000000 --- a/devel/google-gdata/files/patch-Makefile +++ /dev/null @@ -1,44 +0,0 @@ ---- Makefile.orig 2013-06-14 18:54:08 UTC -+++ Makefile -@@ -1,6 +1,3 @@ --CSC1=mcs --CSC=gmcs -- - DEFINES=/d:TRACE - - VERSION=$(shell egrep AssemblyVersion version/AssemblyVersion.cs | egrep -o \([[:digit:]]\.\)+[[:digit:]]+) -@@ -33,7 +30,7 @@ ALLLIBS = \ - - UNINSTALLLIBS = $(basename $(ALLLIBS)) - --FRAMEWORK_REFS = -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll -+FRAMEWORK_REFS = -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll -r:%%LOCALBASE%%/lib/mono/Newtonsoft.Json/Newtonsoft.Json.dll - - PKGCONFIG_FILES = $(patsubst %.pc.in,%.pc,$(wildcard misc/*.pc.in)) - -@@ -112,14 +109,14 @@ clean: - install: all - for i in $(ALLLIBS); do gacutil -i $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done - install -d "$(DESTDIR)$(PKGCONFIGDIR)" -- install -m 644 -t "$(DESTDIR)$(PKGCONFIGDIR)" $(PKGCONFIG_FILES) -+ install -m 644 $(PKGCONFIG_FILES) "$(DESTDIR)$(PKGCONFIGDIR)" - - uninstall: - for i in $(UNINSTALLLIBS); do gacutil -u $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done - for i in $(PKGCONFIG_FILES) ; do rm "$(DESTDIR)$(PKGCONFIGDIR)/$$i" ; done - - tests: $(ALLLIBS) -- $(CSC) $(DEFINES) -target:library -out:unittests.dll $(ALLREFS) -r:nunit.framework.dll $(test_sources) -+ $(CSC) $(DEFINES) -target:library -out:unittests.dll $(ALLREFS) -r:packages/nunit.framework/lib/nunit.framework.dll $(test_sources) - - gapps_sample_sources = samples/appsforyourdomain/appsdemo.cs - gapps_appsdemo.exe: $(ALLLIBS) $(gapps_sample_sources) -@@ -147,7 +144,7 @@ gspreadsheet_demo.exe: - - PhotoTool_sources = $(wildcard samples/PhotoBrowser/*.cs) - PhotoTool.exe: $(ALLLIBS) $(PhotoTool_sources) -- $(CSC) -out:$@ $(ALLREFS) -r:System.Windows.Forms -r:System.Drawing -r:System.Data $(PhotoTool_sources) -+ $(CSC) -out:$@ $(ALLREFS) -r:System.Windows.Forms.dll -r:System.Drawing.dll -r:System.Data.dll $(PhotoTool_sources) - - test: - nunit-console2 unittests.dll diff --git a/devel/google-gdata/files/patch-src_gapps_auditservice.cs b/devel/google-gdata/files/patch-src_gapps_auditservice.cs deleted file mode 100644 index 8260a6c546ab..000000000000 --- a/devel/google-gdata/files/patch-src_gapps_auditservice.cs +++ /dev/null @@ -1,10 +0,0 @@ ---- src/gapps/auditservice.cs.orig 2018-01-21 06:35:28 UTC -+++ src/gapps/auditservice.cs -@@ -18,6 +18,7 @@ using System.Collections.Generic; - using System.Web; - using Google.GData.Extensions.Apps; - using Google.GData.Client; -+using HttpUtility = Google.GData.Client.HttpUtility; - - namespace Google.GData.Apps { - /// <summary> diff --git a/devel/google-gdata/pkg-descr b/devel/google-gdata/pkg-descr deleted file mode 100644 index deaff4a87f34..000000000000 --- a/devel/google-gdata/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -The GData .NET Client Library includes source code to make it easy to -access data through Google Data APIs (e.g. Contacts, Calendar). - -WWW: http://code.google.com/p/google-gdata/ diff --git a/emulators/Makefile b/emulators/Makefile index 0cbd4e7c5cb1..e66efc8d0542 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -162,7 +162,6 @@ SUBDIR += vmips SUBDIR += vmsbackup SUBDIR += vmw - SUBDIR += vpcs SUBDIR += vxtools SUBDIR += wine SUBDIR += wine-devel diff --git a/emulators/vpcs/Makefile b/emulators/vpcs/Makefile deleted file mode 100644 index 49595205523b..000000000000 --- a/emulators/vpcs/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org> - -PORTNAME= vpcs -PORTVERSION= 0.8 -CATEGORIES= emulators -MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-src - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Virtual PC Simulator - -LICENSE= BSD2CLAUSE - -DEPRECATED= Upstream unmaintained -EXPIRATION_DATE=2021-10-27 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: vpc -BROKEN_FreeBSD_14= ld: error: duplicate symbol: vpc -ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= non-portable - -USES= tar:tbz - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -PLIST_FILES= bin/vpcs man/man1/vpcs.1.gz - -post-patch: - @${REINPLACE_CMD} -e 's|i386|${ARCH}|g' ${WRKSRC}/src/Makefile.fbsd - -do-build: - cd ${WRKSRC}/src && ${BSDMAKE} -f Makefile.fbsd - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/vpcs ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/vpcs.1 ${STAGEDIR}${MANPREFIX}/man/man1 - -.include <bsd.port.mk> diff --git a/emulators/vpcs/distinfo b/emulators/vpcs/distinfo deleted file mode 100644 index f07bd4878990..000000000000 --- a/emulators/vpcs/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (vpcs-0.8-src.tbz) = dca602d0571ba852c916632c4c0060aa9557dd744059c0f7368860cfa8b3c993 -SIZE (vpcs-0.8-src.tbz) = 157871 diff --git a/emulators/vpcs/pkg-descr b/emulators/vpcs/pkg-descr deleted file mode 100644 index 2e65bd70022a..000000000000 --- a/emulators/vpcs/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or -ping/traceroute the other hosts/routers from the virtual PCs when you study the -Cisco routers in the Dynamips. VPCS is not the traditional PC, it is just a -program running on the Linux or FreeBSD, and only few network commands can be -used in it. But VPCS can give you a big hand when you study the Cisco devices in -the Dynamips. VPCS can replace the routers or VMware boxes which are used as PCs -in the Dynamips network. It can save your CPU/Memory. It is very small. - -VPCS can be run in udp or ether mode. In the udp mode, VPCS sends or receives -the packets via udp. In the ether mode, via /dev/tap. - -WWW: https://wiki.freecode.com.cn/doku.php?id=wiki:vpcs diff --git a/net/Makefile b/net/Makefile index 387e2b69cbf7..3c227cdaf043 100644 --- a/net/Makefile +++ b/net/Makefile @@ -283,7 +283,6 @@ SUBDIR += ipsvd SUBDIR += ipxe SUBDIR += irrd - SUBDIR += irrd-legacy SUBDIR += isboot-kmod SUBDIR += isc-dhcp44-client SUBDIR += isc-dhcp44-relay diff --git a/net/irrd-legacy/Makefile b/net/irrd-legacy/Makefile deleted file mode 100644 index f527b7747411..000000000000 --- a/net/irrd-legacy/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# Created by: TAKANO Yuji <takano@net-chef.net> - -PORTNAME= irrd -PORTVERSION= 2.3.10 -DISTVERSIONPREFIX= v -CATEGORIES= net -PKGNAMESUFFIX= -legacy - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Internet Routing Registry database server - -LICENSE= BSD4CLAUSE -LICENSE_FILE= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}/COPYRIGHT - -DEPRECATED= Use net/irrd -EXPIRATION_DATE=2021-10-27 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: error_buf -BROKEN_FreeBSD_14= ld: error: duplicate symbol: error_buf - -RUN_DEPENDS= wget:ftp/wget - -USES= shebangfix -USE_GITHUB= yes -USE_RC_SUBR= irrd - -GH_ACCOUNT= irrdnet -GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} - -WRKSRC_SUBDIR= src - -IRRD_CONFDIR= ${PREFIX}/etc - -GNU_CONFIGURE= yes -CONFIGURE_ENV= YACC="${YACC}" -MAKE_JOBS_UNSAFE= yes -DESTDIRNAME= STAGEDIR - -OPTIONS_DEFINE= IPV6 -IPV6_CONFIGURE_ENABLE= ipv6 - -SHEBANG_FILES= programs/irrdcacher/irrdcacher \ - programs/irrdcacher/ripe2rpsl - -PLIST_FILES= etc/irrd.conf.sample \ - man/man8/irrd.8.gz \ - sbin/irr_notify \ - sbin/irr_rpsl_check \ - sbin/irr_rpsl_submit \ - sbin/irrd \ - sbin/irrdcacher \ - sbin/ripe2rpsl - -post-patch: - ${REINPLACE_CMD} -e 's|/etc/irrd.conf|${IRRD_CONFDIR}/irrd.conf|g' \ - ${WRKSRC}/programs/IRRd/irrd.8 \ - ${WRKSRC}/programs/IRRd/main.c \ - ${WRKSRC}/programs/hdr_comm/read_conf.c \ - ${WRKSRC}/programs/irr_notify/main.c \ - ${WRKSRC}/programs/irr_rpsl_check/main.c \ - ${WRKSRC}/programs/irr_rpsl_submit/main.c \ - ${WRKSRC}/programs/irrdcacher/irrdcacher \ - ${WRKSRC}/programs/rps_dist/rpsdist.c - ${REINPLACE_CMD} -e 's|\($$(DESTDIR)\)|$$(STAGEDIR)\1|g' \ - -e 's|\( -m 755 \)| -s\1|g' \ - -e 's| -o root -g bin||g' \ - ${WRKSRC}/programs/IRRd/Makefile \ - ${WRKSRC}/programs/irr_notify/Makefile \ - ${WRKSRC}/programs/irr_rpsl_check/Makefile \ - ${WRKSRC}/programs/irr_rpsl_submit/Makefile - -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/irrdcacher \ - ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/ripe2rpsl \ - ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample \ - ${STAGEDIR}${IRRD_CONFDIR} - ${INSTALL_DATA} ${WRKSRC}/programs/IRRd/irrd.8 \ - ${STAGEDIR}${PREFIX}/man/man8 - -.include <bsd.port.mk> diff --git a/net/irrd-legacy/distinfo b/net/irrd-legacy/distinfo deleted file mode 100644 index 473574c6084e..000000000000 --- a/net/irrd-legacy/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1582065766 -SHA256 (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = acc1b6e5b219c617b1a614cfd586901183a184ee91a42c81473724161a63d65a -SIZE (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = 769512 diff --git a/net/irrd-legacy/files/irrd.in b/net/irrd-legacy/files/irrd.in deleted file mode 100644 index 7b9def16c9d3..000000000000 --- a/net/irrd-legacy/files/irrd.in +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# PROVIDE: irrd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# Define these irrd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/irrd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -irrd_enable="${irrd_enable:-NO}" # Enable irrd -#irrd_program="%%PREFIX%%/sbin/irrd" # Location of irrd -irrd_flags="${irrd_flags:--u}" # Flags to irrd program - -. /etc/rc.subr - -name="irrd" -rcvar=irrd_enable -command="%%PREFIX%%/sbin/irrd" -required_files="%%PREFIX%%/etc/irrd.conf" - -load_rc_config $name -run_rc_command "$1" diff --git a/net/irrd-legacy/files/patch-configure b/net/irrd-legacy/files/patch-configure deleted file mode 100644 index 094af76d68de..000000000000 --- a/net/irrd-legacy/files/patch-configure +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.orig 2006-09-12 17:40:55 UTC -+++ configure -@@ -2638,7 +2638,6 @@ - THREAD_CFLAGS="-D_THREAD_SAFE -pthread" - fi - CRYPT_LIB="-lcrypt" -- ac_pthrlib="c_r" - ;; - linux* ) - CRYPT_LIB="-lcrypt" -@@ -6011,7 +6010,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <netinet/in.h> -+#include <netinet6/in6.h> - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | diff --git a/net/irrd-legacy/files/patch-lib_config_config__file.c b/net/irrd-legacy/files/patch-lib_config_config__file.c deleted file mode 100644 index 70891c6d9814..000000000000 --- a/net/irrd-legacy/files/patch-lib_config_config__file.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/config/config_file.c.orig 2015-04-03 11:26:26 UTC -+++ lib/config/config_file.c -@@ -772,7 +772,7 @@ config_line_address (uii_connection_t * uii, prefix_t - Deref_Prefix (prefix); - return (1); - } -- if (prefix_compare2 (UII->prefix, prefix) != 0) { -+ if ( UII->prefix == NULL || prefix_compare2 (UII->prefix, prefix) != 0) { - set_uii (UII, UII_ADDR, prefix, 0); - listen_uii2 (NULL); - } diff --git a/net/irrd-legacy/files/patch-lib_mrt_prefix.c b/net/irrd-legacy/files/patch-lib_mrt_prefix.c deleted file mode 100644 index c76bbd8006dd..000000000000 --- a/net/irrd-legacy/files/patch-lib_mrt_prefix.c +++ /dev/null @@ -1,21 +0,0 @@ -Index: lib/mrt/prefix.c ---- lib/mrt/prefix.c.orig 2015-04-03 11:26:26 UTC -+++ lib/mrt/prefix.c -@@ -5,7 +5,7 @@ - #include <mrt.h> - #include <netdb.h> - --#ifndef __GLIBC__ -+#if !defined(__GLIBC__) && !defined(__FreeBSD__) - #ifdef __osf__ - - /* apparently, OSF's gethostby{name,addr}_r's are different, broken, and -@@ -29,7 +29,7 @@ struct hostent *gethostbyaddr_r - For the time being, this part tries to convert Linux glibc 2.X - gethostXX_r into Solaris's that we use to code MRT. -- masaki - */ --#if __GLIBC__ >= 2 -+#if __GLIBC__ >= 2 || (defined(__FreeBSD__) && defined(HAVE_GETHOSTBYNAME_R)) - /* Glibc 2.X - - int gethostbyname_r (const char *name, struct hostent *result_buf, diff --git a/net/irrd-legacy/files/patch-programs_IRRd_database.c b/net/irrd-legacy/files/patch-programs_IRRd_database.c deleted file mode 100644 index 856681484d88..000000000000 --- a/net/irrd-legacy/files/patch-programs_IRRd_database.c +++ /dev/null @@ -1,16 +0,0 @@ ---- programs/IRRd/database.c.orig 2015-04-03 11:26:26 UTC -+++ programs/IRRd/database.c -@@ -59,9 +59,11 @@ void database_clear (irr_database_t *db) { - - db->radix_v4 = New_Radix (32); - db->radix_v6 = New_Radix (128); -- fclose (db->db_fp); - -- db->db_fp = NULL; -+ if (db->db_fp) { -+ fclose (db->db_fp); -+ db->db_fp = NULL; -+ } - } - - diff --git a/net/irrd-legacy/files/patch-programs_IRRd_uii__commands.c b/net/irrd-legacy/files/patch-programs_IRRd_uii__commands.c deleted file mode 100644 index cf68c6dc14ac..000000000000 --- a/net/irrd-legacy/files/patch-programs_IRRd_uii__commands.c +++ /dev/null @@ -1,55 +0,0 @@ ---- programs/IRRd/uii_commands.c.orig 2015-04-03 11:26:26 UTC -+++ programs/IRRd/uii_commands.c -@@ -14,6 +14,8 @@ - #include <ctype.h> - #include "irrd.h" - -+#include <errno.h> -+ - #include <fcntl.h> - #ifndef SETPGRP_VOID - #endif -@@ -700,6 +702,10 @@ int uii_read_update_file (uii_connection_t *uii, char - - void run_cmd (char *cmd, FILE **in, FILE **out) { - int pin[2], pout[2]; -+ int pid; -+ int omask, pstat; -+ pid_t ppid; -+ extern int errno; - - if (in != NULL) - *in = NULL; -@@ -713,7 +719,9 @@ void run_cmd (char *cmd, FILE **in, FILE **out) { - if (out != NULL) - pipe (pout); - -- if (fork() == 0) { /* We're the child */ -+/* if (fork() == 0) { */ -+ pid = fork(); -+ if (pid == 0) { /* We're the child */ - if (in != NULL) { - close (pin[1]); - dup2 (pin[0], 0); -@@ -727,7 +735,7 @@ void run_cmd (char *cmd, FILE **in, FILE **out) { - close (pout[1]); - } - -- execl("/bin/sh", "sh", "-c", cmd, NULL); -+ execlp("/bin/sh", "sh", "-c", cmd, NULL); - _exit(127); - } - -@@ -741,6 +749,12 @@ void run_cmd (char *cmd, FILE **in, FILE **out) { - close (pin[0]); - *in = fdopen (pin[1], "w"); - } -+ -+ omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP)); -+ do { -+ ppid = waitpid(pid, (int *) &pstat, 0); -+ } while (pid == -1 && errno == EINTR); -+ (void)sigsetmask(omask); - } - - int kill_irrd (uii_connection_t *uii) { diff --git a/net/irrd-legacy/pkg-descr b/net/irrd-legacy/pkg-descr deleted file mode 100644 index fbadf223c414..000000000000 --- a/net/irrd-legacy/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Internet Routing Registry Daemon (IRRd). - -WWW: http://www.irrd.net/