diff options
110 files changed, 11 insertions, 3666 deletions
@@ -8978,3 +8978,14 @@ www/httpie|www/py-httpie|2017-01-09|Renamed to match upstream (PyPI) name sysutils/istatd|sysutils/istatserver|2017-01-09|Project was renamed devel/py-gflags|devel/py-python-gflags|2017-01-10|Rename to match PyPI naming java/wildfly100|java/wildfly10|2017-01-10|Remove minor version number from port name +net/cyphesis||2017-01-15|Has expired: Does not compile on FreeBSD 10+ +net/gpxe||2017-01-15|Has expired: does not build on FreeBSD 10.x and later +net/openospfd||2017-01-15|Has expired: requires old CARP implementation (interface layer) +security/openbsm-devel||2017-01-15|Has expired: is not needed under FreeBSD 10.x or higher +security/ssh-copy-id||2017-01-15|Has expired: is already in the base system +sysutils/apt||2017-01-15|Has expired: does not build on 10+ +archivers/tclmkziplib||2017-01-15|Has expired: Abandonware, please use bundled zlib package [http://tcl.tk/man/tcl8.6/TclCmd/zlib.htm] +x11-drivers/drm-kmod||2017-01-15|Has expired: this port is only for 9.3 systems +audio/xmms-openspc||2017-01-15|Has expired: does not build on FreeBSD 10.x and later +audio/aureal-kmod||2017-01-15|Has expired: does not build (and fetch) +emulators/doscmd||2017-01-15|Has expired: does not build (accesses field of opaque structure) diff --git a/archivers/Makefile b/archivers/Makefile index 7ded3df90a03..e70be16411cb 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -205,7 +205,6 @@ SUBDIR += stuffit SUBDIR += szip SUBDIR += tardy - SUBDIR += tclmkziplib SUBDIR += thunar-archive-plugin SUBDIR += torrentzip SUBDIR += ucl diff --git a/archivers/tclmkziplib/Makefile b/archivers/tclmkziplib/Makefile deleted file mode 100644 index dd59cf2414de..000000000000 --- a/archivers/tclmkziplib/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Created by: Martin Matuska <mm@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= tclmkziplib -PORTVERSION= 1.0 -PORTREVISION= 2 -CATEGORIES= archivers tcl -MASTER_SITES= http://mkextensions.sourceforge.net/ -DISTNAME= mkZiplib${PORTVERSION:S/.//} - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= GZIP and ZIP support for TCL; dynamically loadable - -BROKEN_aarch64= Fails to build: error: operand of type va_list where arithmetic or pointer type is required -DEPRECATED= Abandonware, please use bundled zlib package [http://tcl.tk/man/tcl8.6/TclCmd/zlib.htm] -EXPIRATION_DATE=2017-01-15 - -USES+= tcl zip - -WRKSRC= ${WRKDIR}/mkZiplib${PORTVERSION} - -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV= VERSION=${PORTVERSION:S/.//} \ - TCL_VER=${TCL_VER} \ - TCLCONFIG=${TCL_LIBDIR}/tclConfig.sh - -PLIST_SUB+= VERSION=${PORTVERSION:S/.//} - -OPTIONS_DEFINE= DOCS - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/mkZiplib - ${INSTALL_LIB} ${WRKSRC}/mkZiplib${PORTVERSION:S/.//}.so ${STAGEDIR}${PREFIX}/lib/mkZiplib - ${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/mkZiplib - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/mkZiplib${PORTVERSION:S/.//}.htm ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/archivers/tclmkziplib/distinfo b/archivers/tclmkziplib/distinfo deleted file mode 100644 index 5736c049d8df..000000000000 --- a/archivers/tclmkziplib/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mkZiplib10.zip) = bc1f43e04702fb0157365ee5ff7e75878908ae9e357bd0b6deda75bc8de6d7c1 -SIZE (mkZiplib10.zip) = 97703 diff --git a/archivers/tclmkziplib/files/Makefile.bsd b/archivers/tclmkziplib/files/Makefile.bsd deleted file mode 100644 index 4be0d99b678b..000000000000 --- a/archivers/tclmkziplib/files/Makefile.bsd +++ /dev/null @@ -1,24 +0,0 @@ -PACKAGE = mkZiplib -SHLIB_NAME = ${PACKAGE}${VERSION}.so - -SRCS = unzip.c zip.c mkZiplib${VERSION}.c - -SOBJS= ${SRCS:N*.h:R:S/$/.o/} - -TCL_SHLIB_CFLAGS!= . ${TCLCONFIG}; \ - echo $$TCL_SHLIB_CFLAGS -TCL_INCLUDE_SPEC!= . ${TCLCONFIG}; \ - echo $$TCL_INCLUDE_SPEC -TCL_STUB_LIB_SPEC!= . ${TCLCONFIG}; \ - echo $$TCL_STUB_LIB_SPEC - -CFLAGS += ${TCL_SHLIB_CFLAGS} ${TCL_INCLUDE_SPEC} -LDFLAGS += ${TCL_STUB_LIB_SPEC} -lz - -all: ${SHLIB_NAME} - -${SHLIB_NAME}: ${SOBJS} - ${CC} ${LDFLAGS} -shared -o ${.TARGET} ${SOBJS} - -clean: - @rm -f ${SHLIB_NAME} ${SOBJS} diff --git a/archivers/tclmkziplib/pkg-descr b/archivers/tclmkziplib/pkg-descr deleted file mode 100644 index 0eab3b6bae18..000000000000 --- a/archivers/tclmkziplib/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -mkZiplib is a wrapper for Zlib 1.1.3 and Minizip 0.15. - -It is free, very portable and works for virtually any computer hardware -and operating system. With mkZiplib you can compress/decompress data and -work with .gz and .zip files from within Tcl. - -WWW: http://mkextensions.sourceforge.net diff --git a/archivers/tclmkziplib/pkg-plist b/archivers/tclmkziplib/pkg-plist deleted file mode 100644 index 654977bad10a..000000000000 --- a/archivers/tclmkziplib/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/mkZiplib/pkgIndex.tcl -lib/mkZiplib/mkZiplib%%VERSION%%.so -%%PORTDOCS%%%%DOCSDIR%%/mkZiplib10.htm diff --git a/audio/Makefile b/audio/Makefile index f2da9be46fd6..d69b64792274 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -43,7 +43,6 @@ SUBDIR += audiere SUBDIR += audiotag SUBDIR += aumix - SUBDIR += aureal-kmod SUBDIR += autocd SUBDIR += autotalent SUBDIR += autozen @@ -837,7 +836,6 @@ SUBDIR += xmms-mailnotify SUBDIR += xmms-nas SUBDIR += xmms-nsf - SUBDIR += xmms-openspc SUBDIR += xmms-sapplug SUBDIR += xmms-scrobbler SUBDIR += xmms-sexypsf diff --git a/audio/aureal-kmod/Makefile b/audio/aureal-kmod/Makefile deleted file mode 100644 index 62b05a25abcc..000000000000 --- a/audio/aureal-kmod/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# Created by: Maxim Sobolev <sobomax@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= aureal -PORTVERSION= 1.5 -PORTREVISION= 7 -CATEGORIES= audio -MASTER_SITES= GOOGLE_CODE -PROJECTHOST= ${PORTNAME}-snd -PKGNAMESUFFIX= -kmod -DISTNAME= au88x0-${PORTVERSION}_4 - -MAINTAINER= c.kworr@gmail.com -COMMENT= Driver for Aureal Vortex based soundcards - -BROKEN= does not build (and fetch) -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2017-01-15 - -ONLY_FOR_ARCHS= i386 -STRAYFILES= au88x0.h au88x0.c asp10.o asp20.o asp30.o - -KMODDIR= ${PREFIX}/modules/au88x0 -KMODDIR_REL= ${KMODDIR:S%${PREFIX}/%%} - -USE_RC_SUBR= ${PORTNAME} -SUB_FILES= pkg-message -SUB_LIST= KMODDIR=${KMODDIR} - -WRKSRC= ${WRKDIR} - -MAKE_ENV= WRKSRC="${WRKSRC}" -MAKE_ARGS= KMODDIR="${KMODDIR}" - -USES= kmod - -.include <bsd.port.pre.mk> - -EXTRA_PATCHES+= ${PATCHDIR}/extra_800000_patch-au88x0.c - -pre-everything:: -.for STRAY in ${STRAYFILES} -.if exists(${SRC_BASE}/sys/dev/sound/pci/${STRAY}) - @${ECHO} - @${ECHO} "You have stray code in your tree. Make sure you" - @${ECHO} "do not have any of the following:" - @${ECHO} - @${ECHO} "${SRC_BASE}/sys/dev/sound/pci/au88x0.c" - @${ECHO} "${SRC_BASE}/sys/dev/sound/pci/au88x0.h" - @${ECHO} "${SRC_BASE}/sys/dev/sound/pci/asp10.o" - @${ECHO} "${SRC_BASE}/sys/dev/sound/pci/asp20.o" - @${ECHO} "${SRC_BASE}/sys/dev/sound/pci/asp30.o" - @${ECHO} - @${FALSE} -.endif -.endfor - -.include <bsd.port.post.mk> diff --git a/audio/aureal-kmod/distinfo b/audio/aureal-kmod/distinfo deleted file mode 100644 index ca8bed1ef907..000000000000 --- a/audio/aureal-kmod/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -SHA256 (au88x0-1.1_3.tar.gz) = 7029280c0f72874246d2f45be0fabf604d7413873018550444348d4aaafa4c7b -SHA256 (au88x0-1.3_1.tar.gz) = 5595f06752e07669579d6766aa08fe7594a49dee708fa81cf69df9b79da8dcaf -SHA256 (au88x0-1.3_2.tar.gz) = 6060e7e5a60a0b8ef39f2f591e605cb77e046c32f9e0709f1205bd910734fe4c -SHA256 (au88x0-1.3_3.tar.gz) = 6426a66aa3eed9273d162849c672ce4398c277dd7b0e7c53d79c2fdf7d4993cf -SHA256 (au88x0-1.5_4.tar.gz) = 604fa2228578342847eeecda2b28551369e7b00e79b61edcb435cde83a1c0fc9 -SIZE (au88x0-1.1_3.tar.gz) = 217317 -SIZE (au88x0-1.3_1.tar.gz) = 217332 -SIZE (au88x0-1.3_2.tar.gz) = 217346 -SIZE (au88x0-1.3_3.tar.gz) = 217401 -SIZE (au88x0-1.5_4.tar.gz) = 217404 diff --git a/audio/aureal-kmod/files/aureal.in b/audio/aureal-kmod/files/aureal.in deleted file mode 100644 index 583c641d6793..000000000000 --- a/audio/aureal-kmod/files/aureal.in +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# PROVIDE: aureal -# BEFORE: hald -# KEYWORD: nojail -# -# Add the following line to /etc/rc.conf[.local] to enable aureal -# -# aureal_enable="YES" -# -# By default the script automatically detects the right kernel module -# to load, if this fails, you can set "aureal_card" to the right value. -# Possible values are 8810, 8820, and 8830. -# -# If your AMD Athlon system is based on a VIA Apollo KX133 motherboard -# chipset, your system will most certainly lock up shortly after -# you start a playback. To work around this issue please add this following -# line to /etc/rc.conf[.local]: -# -# aureal_viakx133fix="YES" -# - -. /etc/rc.subr - -name="aureal" -rcvar=aureal_enable - -start_cmd="aureal_start" -stop_cmd="aureal_stop" - -load_rc_config $name - -: ${aureal_enable="NO"} -: ${aureal_viakx133fix="NO"} - -aureal_detect() -{ - PCICONF="/usr/sbin/pciconf" - if [ -z "${aureal_card}" -a -x ${PCICONF} ]; then - if [ "`${PCICONF} -l 2>&- | grep 0x000312eb`" ]; then - aureal_card=8810 - elif [ "`${PCICONF} -l 2>&- | grep 0x000112eb`" ]; then - aureal_card=8820 - elif [ "`${PCICONF} -l 2>&- | grep 0x000212eb`" ]; then - aureal_card=8830 - fi - fi - - if [ -z "${aureal_card}" ]; then - err 1 "Unable to determine your Aureal car type - override it by aureal_card rc variable" - fi - - PREFIX=%%PREFIX%% - KMODDIR=%%KMODDIR%% - DRIVERFILE=snd_au${aureal_card} -} - -aureal_start() -{ - aureal_detect - if [ ! -f ${KMODDIR}/${DRIVERFILE}.ko ]; then - err 64 "${KMODDIR}/${DRIVERFILE} for ${aureal_card} not found!" - fi - if ! kldstat -qm pci/snd_au88x0; then - if ! kldload ${KMODDIR}/${DRIVERFILE}.ko; then - warn 'aureal module failed to load' - return 1 - fi - fi - - if checkyesno aureal_viakx133fix; then - pcisel=`${PCICONF} -l 2>&- | grep ^pcm0 | awk -F: '{ gsub("^[^@]*@", ""); print $1":"$2":"$3 }'` - if [ -z "$pcisel" ]; then - warn "Soundcard PCI selector undetermined. Unable to install VIA KX133 workaround. Starting a playback will likely to lock-up your system!" - return 0 - fi - - oldvalue=`${PCICONF} -r -b $pcisel 0x40 2>&- | sed 's/ *$//'` - ${PCICONF} -w -b $pcisel 0x40 0xff - newvalue=`${PCICONF} -r -b $pcisel 0x40 2>&- | sed 's/ *$//'` - info "with VIA KX133 workaround: ${pcisel},0x40: ${oldvalue} -> ${newvalue}" - fi - - return 0 -} - -aureal_stop() -{ - aureal_detect - kldstat -qm pci/snd_au88x0 && kldunload ${DRIVERFILE} - - return 0 -} - -run_rc_command "$1" diff --git a/audio/aureal-kmod/files/extra_800000_patch-au88x0.c b/audio/aureal-kmod/files/extra_800000_patch-au88x0.c deleted file mode 100644 index 36324069774f..000000000000 --- a/audio/aureal-kmod/files/extra_800000_patch-au88x0.c +++ /dev/null @@ -1,121 +0,0 @@ ---- ./au88x0.c.orig 2010-07-11 01:34:42.000000000 +0600 -+++ ./au88x0.c 2010-07-11 01:34:51.000000000 +0600 -@@ -24,6 +24,10 @@ - * SUCH DAMAGE. - */ - -+#ifdef HAVE_KERNEL_OPTION_HEADERS -+#include "opt_snd.h" -+#endif -+ - /* - * Part of this code was inspired by Aureal's linux driver - */ -@@ -198,28 +202,28 @@ - static struct au_info *find_device_core(void *core_obj); - - static u_int32_t au_playfmt[] = { -- AFMT_MU_LAW, -- AFMT_STEREO | AFMT_MU_LAW, -- AFMT_A_LAW, -- AFMT_STEREO | AFMT_A_LAW, -- AFMT_U8, -- AFMT_STEREO | AFMT_U8, -- AFMT_S16_LE, -- AFMT_STEREO | AFMT_S16_LE, -+ SND_FORMAT(AFMT_MU_LAW, 1, 0), -+ SND_FORMAT(AFMT_MU_LAW, 2, 0), -+ SND_FORMAT(AFMT_A_LAW, 1, 0), -+ SND_FORMAT(AFMT_A_LAW, 2, 0), -+ SND_FORMAT(AFMT_U8, 1, 0), -+ SND_FORMAT(AFMT_U8, 2, 0), -+ SND_FORMAT(AFMT_S16_LE, 1, 0), -+ SND_FORMAT(AFMT_S16_LE, 2, 0), - 0 - }; - - static struct pcmchan_caps au_playcaps = {4000, 48000, au_playfmt, 0}; - - static u_int32_t au_recfmt[] = { -- AFMT_MU_LAW, -- AFMT_STEREO | AFMT_MU_LAW, -- AFMT_A_LAW, -- AFMT_STEREO | AFMT_A_LAW, -- AFMT_U8, -- AFMT_STEREO | AFMT_U8, -- AFMT_S16_LE, -- AFMT_STEREO | AFMT_S16_LE, -+ SND_FORMAT(AFMT_MU_LAW, 1, 0), -+ SND_FORMAT(AFMT_MU_LAW, 2, 0), -+ SND_FORMAT(AFMT_A_LAW, 1, 0), -+ SND_FORMAT(AFMT_A_LAW, 2, 0), -+ SND_FORMAT(AFMT_U8, 1, 0), -+ SND_FORMAT(AFMT_U8, 2, 0), -+ SND_FORMAT(AFMT_S16_LE, 1, 0), -+ SND_FORMAT(AFMT_S16_LE, 2, 0), - 0 - }; - -@@ -491,7 +495,7 @@ - return left | (right << 8); - } - --static int -+static u_int32_t - aumix_setrecsrc(struct snd_mixer *m, u_int32_t src) - { - struct au_info *au; -@@ -533,7 +537,7 @@ - KOBJMETHOD(mixer_init, aumix_init), - KOBJMETHOD(mixer_set, aumix_set), - KOBJMETHOD(mixer_setrecsrc, aumix_setrecsrc), -- { 0, 0 } -+ KOBJMETHOD_END - }; - MIXER_DECLARE(aumixer); - -@@ -603,15 +607,12 @@ - else if (format & AFMT_MU_LAW) - fmt->eEncoding = ASPFMTULAW; - -- if (format & AFMT_STEREO) -- fmt->wChannels = 2; -- else -- fmt->wChannels = 1; -+ fmt->wChannels = (AFMT_CHANNEL(format) > 1) ? 2 : 1; - SetWaveFormat(ch->wave, &ch->fmt); - return 0; - } - --static int -+static u_int32_t - auchan_setspeed(kobj_t obj, void *data, u_int32_t speed) - { - struct au_chinfo *ch = data; -@@ -621,7 +622,7 @@ - return speed; - } - --static int -+static u_int32_t - auchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) - { - return blocksize; -@@ -661,7 +662,7 @@ - return 0; - } - --static int -+static u_int32_t - auchan_getptr(kobj_t obj, void *data) - { - struct au_chinfo *ch = data; -@@ -693,7 +694,7 @@ - KOBJMETHOD(channel_trigger, auchan_trigger), - KOBJMETHOD(channel_getptr, auchan_getptr), - KOBJMETHOD(channel_getcaps, auchan_getcaps), -- { 0, 0 } -+ KOBJMETHOD_END - }; - CHANNEL_DECLARE(auchan); - diff --git a/audio/aureal-kmod/files/patch-10_Makefile b/audio/aureal-kmod/files/patch-10_Makefile deleted file mode 100644 index 6f9a898d3553..000000000000 --- a/audio/aureal-kmod/files/patch-10_Makefile +++ /dev/null @@ -1,6 +0,0 @@ ---- 10/Makefile.orig 2016-07-26 13:37:02 UTC -+++ 10/Makefile -@@ -0,0 +1,3 @@ -+MODEL = 10 -+ -+.include <bsd.kmod.mk> diff --git a/audio/aureal-kmod/files/patch-20_Makefile b/audio/aureal-kmod/files/patch-20_Makefile deleted file mode 100644 index 6725bb1654a1..000000000000 --- a/audio/aureal-kmod/files/patch-20_Makefile +++ /dev/null @@ -1,6 +0,0 @@ ---- 20/Makefile.orig 2016-07-26 13:37:02 UTC -+++ 20/Makefile -@@ -0,0 +1,3 @@ -+MODEL = 20 -+ -+.include <bsd.kmod.mk> diff --git a/audio/aureal-kmod/files/patch-30_Makefile b/audio/aureal-kmod/files/patch-30_Makefile deleted file mode 100644 index 6db2037ad3b1..000000000000 --- a/audio/aureal-kmod/files/patch-30_Makefile +++ /dev/null @@ -1,6 +0,0 @@ ---- 30/Makefile.orig 2016-07-26 13:37:02 UTC -+++ 30/Makefile -@@ -0,0 +1,3 @@ -+MODEL = 30 -+ -+.include <bsd.kmod.mk> diff --git a/audio/aureal-kmod/files/patch-Makefile b/audio/aureal-kmod/files/patch-Makefile deleted file mode 100644 index d215c4e716c4..000000000000 --- a/audio/aureal-kmod/files/patch-Makefile +++ /dev/null @@ -1,6 +0,0 @@ ---- Makefile.orig 2016-07-26 13:37:02 UTC -+++ Makefile -@@ -0,0 +1,3 @@ -+SUBDIR = 10 20 30 -+ -+.include <bsd.subdir.mk> diff --git a/audio/aureal-kmod/files/patch-Makefile.inc b/audio/aureal-kmod/files/patch-Makefile.inc deleted file mode 100644 index f41228e69643..000000000000 --- a/audio/aureal-kmod/files/patch-Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.inc.orig 2016-07-26 13:37:02 UTC -+++ Makefile.inc -@@ -0,0 +1,14 @@ -+.PATH: /sys/dev/sound/pci ${WRKSRC} -+ -+KMODDIR= ${PREFIX}/lib/au88x0 -+KMOD= snd_au88${MODEL} -+.if ${OSVERSION} < 500000 -+KMODDEPS= snd_pcm -+.endif -+SRCS+= au88x0.c -+SRCS+= device_if.h bus_if.h isa_if.h pci_if.h -+.if ${OSVERSION} > 500000 || defined(HAVE_KOBJ_PCM) -+SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h -+.endif -+OBJS= ${WRKSRC}/asp${MODEL}.o -+CFLAGS+= -I${WRKSRC} diff --git a/audio/aureal-kmod/files/patch-au88x0.c b/audio/aureal-kmod/files/patch-au88x0.c deleted file mode 100644 index f0f17b4b9a63..000000000000 --- a/audio/aureal-kmod/files/patch-au88x0.c +++ /dev/null @@ -1,67 +0,0 @@ ---- au88x0.c.orig 2016-07-26 13:37:02 UTC -+++ au88x0.c -@@ -33,10 +33,11 @@ - */ - - #include <dev/sound/pcm/sound.h> --#include <dev/sound/pci/au88x0.h> -+#include "au88x0.h" -+#include <sys/systm.h> - --#include <pci/pcireg.h> --#include <pci/pcivar.h> -+#include <dev/pci/pcireg.h> -+#include <dev/pci/pcivar.h> - #include <sys/queue.h> - - SND_DECLARE_FILE("$FreeBSD$"); -@@ -577,7 +578,11 @@ auchan_init(kobj_t obj, void *devinfo, s - ch->channel = c; - ch->buffer = b; - ch->run = 0; -- if (sndbuf_alloc(ch->buffer, au->parent_dmat, AU_BUFFSIZE) == -1) { -+ if (sndbuf_alloc(ch->buffer, au->parent_dmat, -+#if __FreeBSD_version >= 700037 -+ 0, -+#endif -+ AU_BUFFSIZE) != 0) { - printf("sndbuf_alloc failed\n"); - return NULL; - } -@@ -769,7 +774,7 @@ au_pci_probe(device_t dev) - } - - if (s) device_set_desc(dev, s); -- return s ? 0 : ENXIO; -+ return s ? BUS_PROBE_DEFAULT : ENXIO; - } - - static int -@@ -803,7 +808,7 @@ au_pci_attach(device_t dev) - data = pci_read_config(dev, PCIR_COMMAND, 2); - - for (i = 0; i < 3; i++) { -- au->regid[i] = PCIR_MAPS + i*4; -+ au->regid[i] = PCIR_BAR(i); - au->regtype[i] = SYS_RES_MEMORY; - au->reg[i] = bus_alloc_resource(dev, au->regtype[i], &au->regid[i], 0, ~0, 1, RF_ACTIVE); - if (!au->reg[i]) { -@@ -853,7 +858,9 @@ au_pci_attach(device_t dev) - /*highaddr*/BUS_SPACE_MAXADDR, - /*filter*/NULL, /*filterarg*/NULL, - /*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff, -- /*flags*/0, &au->parent_dmat) != 0) { -+ /*flags*/0, -+ /*lockfunc*/NULL, /*lockarg*/NULL, -+ &au->parent_dmat) != 0) { - device_printf(dev, "unable to create dma tag\n"); - goto bad; - } -@@ -943,6 +950,6 @@ static driver_t au_driver = { - - - DRIVER_MODULE(snd_au88x0, pci, au_driver, pcm_devclass, 0, 0); --MODULE_DEPEND(snd_au88x0, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER); -+MODULE_DEPEND(snd_au88x0, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); - MODULE_VERSION(snd_au88x0, 1); - diff --git a/audio/aureal-kmod/files/pkg-message.in b/audio/aureal-kmod/files/pkg-message.in deleted file mode 100644 index b8f4e6e65c04..000000000000 --- a/audio/aureal-kmod/files/pkg-message.in +++ /dev/null @@ -1,32 +0,0 @@ -------------------------------------------------------------------------------- -IMPORTANT! MAKE SURE TO READ THE FOLLOWING! - -To use this driver, put the following line in /etc/rc.conf - -aureal_enable="YES" - -To load the driver run (as root): - -%%PREFIX%%/etc/rc.d/aureal start - -To unload it: - -%%PREFIX%%/etc/rc.d/aureal stop - -It'll also load the driver automatically when the system is started. - -In case it fails to detect the type of your Vortex soundcard correctly, -set the 'aureal_card' variable in your /etc/rc.conf to either 8810, 8820, -or 8830 depending on which Aureal chipset you have. - -If your system is based on a Via Apollo KX133 chipset, your computer will -most likely lock up soon after playback is started. This is a known issue. -Make sure you put - -aureal_viakx133fix="YES" - -in your /etc/rc.conf. - -Please note that you also need to have the 'sound.ko' module loaded already. - -------------------------------------------------------------------------------- diff --git a/audio/aureal-kmod/pkg-descr b/audio/aureal-kmod/pkg-descr deleted file mode 100644 index bceacdc6bdce..000000000000 --- a/audio/aureal-kmod/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -FreeBSD driver for Aureal Vortex based sound cards. diff --git a/audio/aureal-kmod/pkg-plist b/audio/aureal-kmod/pkg-plist deleted file mode 100644 index 5b798a3a1ec1..000000000000 --- a/audio/aureal-kmod/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -/%%KMODDIR%%/snd_au8810.ko -/%%KMODDIR%%/snd_au8820.ko -/%%KMODDIR%%/snd_au8830.ko diff --git a/audio/xmms-openspc/Makefile b/audio/xmms-openspc/Makefile deleted file mode 100644 index 1e4295124677..000000000000 --- a/audio/xmms-openspc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Created by: Emanuel Haupt <ehaupt@critical.ch> -# $FreeBSD$ - -PORTNAME= openspc -PORTVERSION= 0.0.3 -PORTREVISION= 5 -CATEGORIES= audio -MASTER_SITES= LOCAL/ehaupt -PKGNAMEPREFIX= xmms- -DISTNAME= xmms-OpenSPC-${PORTVERSION} - -MAINTAINER= ehaupt@FreeBSD.org -COMMENT= SPC player for XMMS using OpenSPC - -BROKEN= does not build on FreeBSD 10.x and later -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2017-01-15 - -BUILD_DEPENDS= nasm:devel/nasm \ - xmms:multimedia/xmms -RUN_DEPENDS= xmms:multimedia/xmms - -GNU_CONFIGURE= yes -USES= libtool - -PLIST_FILES= lib/xmms/Input/openspc.so - -ONLY_FOR_ARCHS= i386 # contains x86 assembler code - -.include <bsd.port.mk> diff --git a/audio/xmms-openspc/distinfo b/audio/xmms-openspc/distinfo deleted file mode 100644 index 17aad2026a2a..000000000000 --- a/audio/xmms-openspc/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xmms-OpenSPC-0.0.3.tar.gz) = b67bc7a2520f0f66fd2f4b97c02daa9e8c2709fa8dff2b1b3ec1811689b919b2 -SIZE (xmms-OpenSPC-0.0.3.tar.gz) = 250310 diff --git a/audio/xmms-openspc/files/patch-src_id666.c b/audio/xmms-openspc/files/patch-src_id666.c deleted file mode 100644 index de8be624624f..000000000000 --- a/audio/xmms-openspc/files/patch-src_id666.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/id666.c.orig 2002-10-12 01:07:41 UTC -+++ src/id666.c -@@ -100,6 +100,7 @@ static void spc_read_ext_id666(int fd, i - break; - - default: /* Who knows. Ignore it. */ -+ break; - } - } - diff --git a/audio/xmms-openspc/pkg-descr b/audio/xmms-openspc/pkg-descr deleted file mode 100644 index bf23a5e0c509..000000000000 --- a/audio/xmms-openspc/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -XMMS input plugin for SPC format support. - -WWW: http://www.xmms.org/plugins.php?details=225 diff --git a/emulators/Makefile b/emulators/Makefile index 3ccad1407391..4e0ce3aedcb6 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -27,7 +27,6 @@ SUBDIR += dgen-sdl SUBDIR += dolphin-emu SUBDIR += dosbox - SUBDIR += doscmd SUBDIR += dtcyber SUBDIR += dynagen SUBDIR += dynagui diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile deleted file mode 100644 index 02aa8829499c..000000000000 --- a/emulators/doscmd/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# $FreeBSD$ - -PORTNAME= doscmd -PORTVERSION= 20110826 -CATEGORIES= emulators -MASTER_SITES= SF/${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= DOS emulator - -BROKEN= does not build (accesses field of opaque structure) -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2017-01-15 - -ONLY_FOR_ARCHS= i386 - -FONTFILES= cp437-8x8.pcf.gz cp437-8x14.pcf.gz cp437-8x16.pcf.gz -PORTDOCS= PROBLEMS README* - -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT= X11 -OPTIONS_SUB= yes - -X11_USE= XORG=x11 -X11_MAKE_ARGS= X11BASE=${LOCALBASE} -X11_MAKE_ARGS_OFF= -DNO_X - -.include <bsd.port.options.mk> - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/emsdriv.sys ${WRKSRC}/redir.com \ - ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MX11} - @${MKDIR} ${STAGEDIR}${DATADIR}/fonts - ${INSTALL_DATA} ${FONTFILES:S,^,${WRKSRC}/,} ${WRKSRC}/fonts.dir \ - ${STAGEDIR}${DATADIR}/fonts -.endif - -.include <bsd.port.mk> diff --git a/emulators/doscmd/distinfo b/emulators/doscmd/distinfo deleted file mode 100644 index 0f558d5492de..000000000000 --- a/emulators/doscmd/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (doscmd-20110826.tar.gz) = bc9187427b381bf0c8aa2e07362db36ebe3582a855a7f1e08bb159d9707feaba -SIZE (doscmd-20110826.tar.gz) = 189004 diff --git a/emulators/doscmd/files/extra-patch-cwd.c b/emulators/doscmd/files/extra-patch-cwd.c deleted file mode 100644 index e44c97eb4c79..000000000000 --- a/emulators/doscmd/files/extra-patch-cwd.c +++ /dev/null @@ -1,16 +0,0 @@ -This call changes internal descriptor in DIR structure so it's -located at the top of file descriptor table. I guess it is needed -to not interfere with other file descriptor order or to keep their -values small. doscmd may work fine without it, but it should be -tested. ---- cwd.c.orig 2011-08-26 16:48:21 UTC -+++ cwd.c -@@ -889,7 +889,7 @@ find_first(u_char *path, int attr, dosdi - ++search->searchend; - *search->searchend++ = '/'; - -- search->dp->dd_fd = squirrel_fd(search->dp->dd_fd); -+ //search->dp->dd_fd = squirrel_fd(search->dp->dd_fd); - - dta->drive = drive | 0x80; - to_dos_fcb(dta->pattern, slash); diff --git a/emulators/doscmd/files/patch-config.c b/emulators/doscmd/files/patch-config.c deleted file mode 100644 index 5dc203212ef3..000000000000 --- a/emulators/doscmd/files/patch-config.c +++ /dev/null @@ -1,19 +0,0 @@ ---- config.c.orig 2011-08-26 16:48:21 UTC -+++ config.c -@@ -213,14 +213,14 @@ init_hard: - quit(1); - } - errno = 0; -- addr = (int)strtol(av[3], '\0', 0); -+ addr = (int)strtol(av[3], NULL, 0); - /* XXX DEBUG ISA-specific */ - if ((errno != 0) || (addr > MAXPORT)) { - fprintf(stderr, "usage: assign com[1-4] path addr irq\n"); - quit(1); - } - errno = 0; -- irq = (unsigned char)strtol(av[4], '\0', 0); -+ irq = (unsigned char)strtol(av[4], NULL, 0); - /* XXX DEBUG ISA-specific */ - if ((errno != 0) || (irq < 2) || (irq > 7)) { - fprintf(stderr, "usage: assign com[1-4] path addr irq[2-7]\n"); diff --git a/emulators/doscmd/files/patch-int13.c b/emulators/doscmd/files/patch-int13.c deleted file mode 100644 index 8d613003debd..000000000000 --- a/emulators/doscmd/files/patch-int13.c +++ /dev/null @@ -1,20 +0,0 @@ ---- int13.c.orig 2011-08-26 16:48:21 UTC -+++ int13.c -@@ -487,7 +487,7 @@ diread(struct diskinfo *di, regcontext_t - off_t res; - - int drive = di - diskinfo; -- di->multi = -1; -+ di->multi = 3; - - if (drive > 1) { - drive -= 2; -@@ -536,7 +536,7 @@ diwrite(struct diskinfo *di, regcontext_ - { - off_t res; - int drive = di - diskinfo; -- di->multi = -1; -+ di->multi = 3; - - if (drive > 1) { - drive -= 2; diff --git a/emulators/doscmd/files/patch-trap.c b/emulators/doscmd/files/patch-trap.c deleted file mode 100644 index 8db98e35cf1c..000000000000 --- a/emulators/doscmd/files/patch-trap.c +++ /dev/null @@ -1,11 +0,0 @@ ---- trap.c.orig 2011-08-26 16:48:21 UTC -+++ trap.c -@@ -295,7 +295,7 @@ sigbus(struct sigframe *sf) - callback_t func; - regcontext_t *REGS = (regcontext_t *)(&sf->sf_uc.uc_mcontext); - -- if (!(R_EFLAGS && PSL_VM)) -+ if (!(R_EFLAGS & PSL_VM)) - fatal("SIGBUS in the emulator\n"); - - if ((int)sf->sf_siginfo != 0) { diff --git a/emulators/doscmd/pkg-descr b/emulators/doscmd/pkg-descr deleted file mode 100644 index 1dbe5940d0af..000000000000 --- a/emulators/doscmd/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -The doscmd utility emulates a sufficiently large subset of the PC BIOS -to boot older DOS versions and run DOS applications. diff --git a/emulators/doscmd/pkg-message b/emulators/doscmd/pkg-message deleted file mode 100644 index 23d9253c24b2..000000000000 --- a/emulators/doscmd/pkg-message +++ /dev/null @@ -1,4 +0,0 @@ -For security reasons, FreeBSD no longer allows mmap() at zero address. -To remove this security protection and allow doscmd to work, you will need -to set sysctl security.bsd.map_at_zero=1 either before running doscmd, or -in /etc/sysctl.conf. diff --git a/emulators/doscmd/pkg-plist b/emulators/doscmd/pkg-plist deleted file mode 100644 index 05b21f38dd4f..000000000000 --- a/emulators/doscmd/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/doscmd -man/man1/doscmd.1.gz -share/doscmd/emsdriv.sys -%%X11%%share/doscmd/fonts/cp437-8x14.pcf.gz -%%X11%%share/doscmd/fonts/cp437-8x16.pcf.gz -%%X11%%share/doscmd/fonts/cp437-8x8.pcf.gz -%%X11%%share/doscmd/fonts/fonts.dir -share/doscmd/redir.com diff --git a/net/Makefile b/net/Makefile index 1db3a399ba28..09ab8e9b4d44 100644 --- a/net/Makefile +++ b/net/Makefile @@ -88,7 +88,6 @@ SUBDIR += ctrace SUBDIR += cvsup-static SUBDIR += cvsync - SUBDIR += cyphesis SUBDIR += czmq SUBDIR += daemonlogger SUBDIR += dante @@ -189,7 +188,6 @@ SUBDIR += googlecl SUBDIR += gopher SUBDIR += gotthard - SUBDIR += gpxe SUBDIR += gq SUBDIR += grdesktop SUBDIR += grilo @@ -506,7 +504,6 @@ SUBDIR += openmq-client SUBDIR += openntpd SUBDIR += opennx - SUBDIR += openospfd SUBDIR += openpgm SUBDIR += openradius SUBDIR += opensips diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile deleted file mode 100644 index 4e6ba2990eed..000000000000 --- a/net/cyphesis/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# Created by: Oliver Lehmann <oliver@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= cyphesis -PORTVERSION= 0.6.2 -PORTREVISION= 8 -CATEGORIES= net -MASTER_SITES= SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION} - -MAINTAINER= oliver@FreeBSD.org -COMMENT= Server for WorldForge games - -LICENSE= GPLv2 - -BROKEN= Does not compile on FreeBSD 10+ -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2017-01-15 - -LIB_DEPENDS= libAtlas-0.6.so:devel/atlas-devel \ - libvarconf-1.0.so:devel/varconf \ - libwfmath-1.0.so:math/wfmath \ - libmercator-0.3.so:devel/mercator \ - libskstream-0.3.so:net/skstream \ - libgcrypt.so:security/libgcrypt \ - libboost_regex.so:devel/boost-libs - -CONFIGURE_ARGS= --with-python=${LOCALBASE} - -GNU_CONFIGURE= yes -USES= gmake pathfix pkgconfig compiler:c++11-lib tar:bzip2 \ - python:2 pgsql -USE_LDCONFIG= yes - -CFLAGS+= -I${LOCALBASE}/include - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e 's| install-dist_docDATA | |g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's| install-confbackupDATA | |g' \ - ${WRKSRC}/data/minimal/Makefile.in \ - ${WRKSRC}/data/mars/Makefile.in \ - ${WRKSRC}/data/Makefile.in - @${REINPLACE_CMD} -e 's|-lpython|-lpthread &|' \ - ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ - ${REINPLACE_CMD} -e 's|$$(datadir)/cyphesis|${DATADIR}|g ; \ - s|confbackupdir = .*|confbackupdir = ${DOCSDIR}/conf|g' - @${REINPLACE_CMD} -e 's|/bash|/sh|' ${WRKSRC}/scripts/extract_revision.sh - @${REINPLACE_CMD} -e '1s|python|${PYTHON_CMD}|' ${WRKSRC}/scripts/gen_buildid.py - @${REINPLACE_CMD} -e 's/#ifdef __APPLE__/#if defined(__APPLE__) || defined(__FreeBSD__)/g; \ - s/#ifndef __APPLE__/#if !defined(__APPLE__) \&\& !defined(__FreeBSD__)/g' \ - ${WRKSRC}/common/system.cpp \ - ${WRKSRC}/server/CommUnixListener.cpp - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/conf -.for file in README COPYING AUTHORS THANKS NEWS ChangeLog TODO FIXME - @${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} -.endfor -.for xmlfile in acorn.xml basic.xml cyphesis.vconf mason.xml werewolf.xml - @${INSTALL_DATA} ${WRKSRC}/data/${xmlfile} ${STAGEDIR}${DOCSDIR}/conf -.endfor - -.include <bsd.port.post.mk> diff --git a/net/cyphesis/distinfo b/net/cyphesis/distinfo deleted file mode 100644 index bc9634a9df2e..000000000000 --- a/net/cyphesis/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cyphesis-0.6.2.tar.bz2) = 251f297b299834ae67abe6196f646ef8f14bc5be3096d03c6ff677ff20acfcfd -SIZE (cyphesis-0.6.2.tar.bz2) = 932099 diff --git a/net/cyphesis/files/patch-common-system_net.cpp b/net/cyphesis/files/patch-common-system_net.cpp deleted file mode 100644 index 576e0cf3b99b..000000000000 --- a/net/cyphesis/files/patch-common-system_net.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- common/system_net.cpp.orig 2012-12-18 19:51:32.000000000 +0100 -+++ common/system_net.cpp 2012-12-19 08:49:52.000000000 +0100 -@@ -28,6 +28,7 @@ - #endif // _WIN32 - - #include <cassert> -+#include <cstdio> - - extern "C" { - #ifdef HAVE_SYS_UTSNAME_H -@@ -80,6 +81,14 @@ - #ifdef HAVE_SYS_UN_H - #ifndef __APPLE__ - #ifndef SO_PEERCRED -+ size_t creds_size; -+ -+#if defined (SCM_CREDENTIALS) -+ creds_size = sizeof(struct ucred); -+#elif defined (SCM_CREDS) -+ creds_size = sizeof(struct cmsgcred); -+#endif -+ - // Prove to the server that we are real. - - unsigned char buf[1]; -@@ -97,12 +106,13 @@ - auth_message.msg_iovlen = 1; - auth_message.msg_name = 0; - auth_message.msg_namelen = 0; -- auth_message.msg_controllen = CMSG_SPACE(sizeof(struct ucred)); -+ auth_message.msg_controllen = CMSG_SPACE(creds_size); - unsigned char * mcb = new unsigned char[auth_message.msg_controllen]; - auth_message.msg_control = mcb; - auth_message.msg_flags = 0; - - struct cmsghdr * control = CMSG_FIRSTHDR(&auth_message); -+#if defined (SCM_CREDENTIALS) - control->cmsg_len = CMSG_LEN(sizeof(struct ucred)); - control->cmsg_level = SOL_SOCKET; - control->cmsg_type = SCM_CREDENTIALS; -@@ -110,8 +120,17 @@ - creds->pid = ::getpid(); - creds->uid = ::getuid(); - creds->gid = ::getgid(); -+#elif defined (SCM_CREDS) -+ control->cmsg_len = CMSG_LEN(sizeof(struct cmsgcred)); -+ control->cmsg_level = SOL_SOCKET; -+ control->cmsg_type = SCM_CREDS; -+ struct cmsgcred * creds = (struct cmsgcred *)CMSG_DATA(control); -+ creds->cmcred_pid = ::getpid(); -+ creds->cmcred_uid = ::getuid(); -+ creds->cmcred_gid = ::getgid(); -+#endif - -- int serr = sendmsg(m_fd, &auth_message, 0); -+ int serr = sendmsg(fd, &auth_message, 0); - - delete [] mcb; - diff --git a/net/cyphesis/files/patch-metaserverapi-MetaServerPacket.cpp b/net/cyphesis/files/patch-metaserverapi-MetaServerPacket.cpp deleted file mode 100644 index 21dda8d1cf21..000000000000 --- a/net/cyphesis/files/patch-metaserverapi-MetaServerPacket.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- metaserverapi/MetaServerPacket.cpp.orig 2014-02-28 09:25:55.000000000 +0100 -+++ metaserverapi/MetaServerPacket.cpp 2014-02-28 09:26:13.000000000 +0100 -@@ -20,6 +20,8 @@ - */ - - -+#include <cstdlib> -+#include <cstdio> - #include "MetaServerPacket.hpp" - - MetaServerPacket::MetaServerPacket() : diff --git a/net/cyphesis/files/patch-physics-BBox.cpp b/net/cyphesis/files/patch-physics-BBox.cpp deleted file mode 100644 index d7bb311100dd..000000000000 --- a/net/cyphesis/files/patch-physics-BBox.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- physics/BBox.cpp.orig 2014-06-15 17:53:14.000000000 +0200 -+++ physics/BBox.cpp 2014-06-15 17:51:40.000000000 +0200 -@@ -19,7 +19,7 @@ - #include "BBox.h" - - #include "common/const.h" -- -+#include <algorithm> - #include <wfmath/axisbox.h> - #include <wfmath/point.h> - diff --git a/net/cyphesis/files/patch-tools-cypython.cpp b/net/cyphesis/files/patch-tools-cypython.cpp deleted file mode 100644 index 01925664b71a..000000000000 --- a/net/cyphesis/files/patch-tools-cypython.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/cypython.cpp.orig 2013-11-27 14:43:48.000000000 +0100 -+++ tools/cypython.cpp 2013-11-27 14:43:56.000000000 +0100 -@@ -32,6 +32,8 @@ - - #include <varconf/config.h> - -+#include <cstdio> -+ - #ifndef READLINE_CXX_SANE // defined in config.h - extern "C" { - #endif diff --git a/net/cyphesis/pkg-descr b/net/cyphesis/pkg-descr deleted file mode 100644 index ca91d8096cd6..000000000000 --- a/net/cyphesis/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Cyphesis is a small scale or personal server for WorldForge games, and is -currently being used to develop new techniques and technologies for the -WorldForge project. Code from cyphesis will also be used to control NPCs -in future servers such as STAGE using AI techniques. - -WWW: http://www.worldforge.org/dev/eng/servers/cyphesis/ diff --git a/net/cyphesis/pkg-plist b/net/cyphesis/pkg-plist deleted file mode 100644 index 2f6d2f86dfc9..000000000000 --- a/net/cyphesis/pkg-plist +++ /dev/null @@ -1,187 +0,0 @@ -bin/cyaddrules -bin/cyclient -bin/cycmd -bin/cyconfig -bin/cyconvertrules -bin/cydb -bin/cydumprules -bin/cyloadrules -bin/cypasswd -bin/cyphesis -bin/cypython -etc/cyphesis/cyphesis.vconf -etc/cyphesis/mars.d/basic.xml -etc/cyphesis/mars.d/characters.xml -etc/cyphesis/mars.d/environment.xml -etc/cyphesis/mars.d/terrain.xml -etc/cyphesis/mason.d/animals.xml -etc/cyphesis/mason.d/basic.xml -etc/cyphesis/mason.d/buildings.xml -etc/cyphesis/mason.d/characters.xml -etc/cyphesis/mason.d/clothing.xml -etc/cyphesis/mason.d/construction.xml -etc/cyphesis/mason.d/devices.xml -etc/cyphesis/mason.d/food.xml -etc/cyphesis/mason.d/mason.xml -etc/cyphesis/mason.d/operations.xml -etc/cyphesis/mason.d/plants.xml -etc/cyphesis/mason.d/properties.xml -etc/cyphesis/mason.d/tasks.xml -etc/cyphesis/mason.d/terrain.xml -etc/cyphesis/mason.d/tools.xml -etc/cyphesis/mason.d/weapons.xml -etc/cyphesis/minimal.d/basic.xml -etc/cyphesis/minimal.d/characters.xml -etc/cyphesis/minimal.d/environment.xml -etc/cyphesis/minimal.d/terrain.xml -man/man1/cyclient.1.gz -man/man1/cycmd.1.gz -man/man1/cyphesis.1.gz -man/man1/cyphesis-tools.1.gz -man/man1/cyaddrules.1.gz -man/man1/cyconvertrules.1.gz -man/man1/cydumprules.1.gz -man/man1/cyloadrules.1.gz -man/man1/cypasswd.1.gz -%%DATADIR%%/rulesets/basic/mind/Goal.py -%%DATADIR%%/rulesets/basic/mind/Knowledge.py -%%DATADIR%%/rulesets/basic/mind/Memory.py -%%DATADIR%%/rulesets/basic/mind/NPCMind.py -%%DATADIR%%/rulesets/basic/mind/__init__.py -%%DATADIR%%/rulesets/basic/mind/compass.py -%%DATADIR%%/rulesets/basic/mind/dictlist.py -%%DATADIR%%/rulesets/basic/mind/goals/__init__.py -%%DATADIR%%/rulesets/basic/mind/goals/animal/__init__.py -%%DATADIR%%/rulesets/basic/mind/goals/animal/domestic.py -%%DATADIR%%/rulesets/basic/mind/goals/animal/herd.py -%%DATADIR%%/rulesets/basic/mind/goals/common/__init__.py -%%DATADIR%%/rulesets/basic/mind/goals/common/common.py -%%DATADIR%%/rulesets/basic/mind/goals/common/misc_goal.py -%%DATADIR%%/rulesets/basic/mind/goals/common/move.py -%%DATADIR%%/rulesets/basic/mind/goals/common/trigger.py -%%DATADIR%%/rulesets/basic/mind/goals/dynamic/DynamicGoal.py -%%DATADIR%%/rulesets/basic/mind/goals/dynamic/__init__.py -%%DATADIR%%/rulesets/basic/mind/goals/dynamic/add_unique_goal.py -%%DATADIR%%/rulesets/basic/mind/goals/humanoid/__init__.py -%%DATADIR%%/rulesets/basic/mind/goals/humanoid/build_home.py -%%DATADIR%%/rulesets/basic/mind/goals/humanoid/construction.py -%%DATADIR%%/rulesets/basic/mind/goals/humanoid/fire.py -%%DATADIR%%/rulesets/basic/mind/goals/humanoid/mason.py -%%DATADIR%%/rulesets/basic/mind/goals/humanoid/transaction.py -%%DATADIR%%/rulesets/basic/mind/goals/humanoid/werewolf.py -%%DATADIR%%/rulesets/basic/mind/panlingua/__init__.py -%%DATADIR%%/rulesets/basic/mind/panlingua/interlinguish.py -%%DATADIR%%/rulesets/basic/mind/panlingua/ontology.py -%%DATADIR%%/rulesets/basic/mind/panlingua/panlingua.py -%%DATADIR%%/rulesets/basic/mind/panlingua/syntax.py -%%DATADIR%%/rulesets/mars/define_mars.py -%%DATADIR%%/rulesets/mars/world/__init__.py -%%DATADIR%%/rulesets/mars/world/objects/Weather.py -%%DATADIR%%/rulesets/mars/world/objects/__init__.py -%%DATADIR%%/rulesets/mars/world/statistics/Statistics.py -%%DATADIR%%/rulesets/mars/world/statistics/__init__.py -%%DATADIR%%/rulesets/mason/benchmarks.py -%%DATADIR%%/rulesets/mason/define_world.py -%%DATADIR%%/rulesets/mason/regression.py -%%DATADIR%%/rulesets/mason/terrain.py -%%DATADIR%%/rulesets/mason/tests.py -%%DATADIR%%/rulesets/mason/world/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/Pile.py -%%DATADIR%%/rulesets/mason/world/objects/Weather.py -%%DATADIR%%/rulesets/mason/world/objects/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/animals/Deer.py -%%DATADIR%%/rulesets/mason/world/objects/animals/Pig.py -%%DATADIR%%/rulesets/mason/world/objects/animals/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/buildings/House.py -%%DATADIR%%/rulesets/mason/world/objects/buildings/House3.py -%%DATADIR%%/rulesets/mason/world/objects/buildings/StoneHouse.py -%%DATADIR%%/rulesets/mason/world/objects/buildings/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/clothing/Garment.py -%%DATADIR%%/rulesets/mason/world/objects/clothing/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/elements/Fire.py -%%DATADIR%%/rulesets/mason/world/objects/elements/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/outdoor/Campfire.py -%%DATADIR%%/rulesets/mason/world/objects/outdoor/Gravestone.py -%%DATADIR%%/rulesets/mason/world/objects/outdoor/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/plants/Fir.py -%%DATADIR%%/rulesets/mason/world/objects/plants/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/plants/seeds/Acorn.py -%%DATADIR%%/rulesets/mason/world/objects/plants/seeds/Apple.py -%%DATADIR%%/rulesets/mason/world/objects/plants/seeds/Fircone.py -%%DATADIR%%/rulesets/mason/world/objects/plants/seeds/Seed.py -%%DATADIR%%/rulesets/mason/world/objects/plants/seeds/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Axe.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Bow.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Bucksaw.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Cleaver.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Pickaxe.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Rope.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Scythe.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Shovel.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Sword.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Tinderbox.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Torch.py -%%DATADIR%%/rulesets/mason/world/objects/tools/Trowel.py -%%DATADIR%%/rulesets/mason/world/objects/tools/__init__.py -%%DATADIR%%/rulesets/mason/world/objects/undead/Skeleton.py -%%DATADIR%%/rulesets/mason/world/objects/undead/__init__.py -%%DATADIR%%/rulesets/mason/world/statistics/Statistics.py -%%DATADIR%%/rulesets/mason/world/statistics/__init__.py -%%DATADIR%%/rulesets/mason/world/tasks/Baking.py -%%DATADIR%%/rulesets/mason/world/tasks/Bisect.py -%%DATADIR%%/rulesets/mason/world/tasks/BuildBloomery.py -%%DATADIR%%/rulesets/mason/world/tasks/Combat.py -%%DATADIR%%/rulesets/mason/world/tasks/Cultivate.py -%%DATADIR%%/rulesets/mason/world/tasks/Delve.py -%%DATADIR%%/rulesets/mason/world/tasks/Destroying.py -%%DATADIR%%/rulesets/mason/world/tasks/Dig.py -%%DATADIR%%/rulesets/mason/world/tasks/Dragging.py -%%DATADIR%%/rulesets/mason/world/tasks/Drying.py -%%DATADIR%%/rulesets/mason/world/tasks/Earthbarrier.py -%%DATADIR%%/rulesets/mason/world/tasks/Earthwall.py -%%DATADIR%%/rulesets/mason/world/tasks/Fishing.py -%%DATADIR%%/rulesets/mason/world/tasks/Furnishings.py -%%DATADIR%%/rulesets/mason/world/tasks/Gateconstruction.py -%%DATADIR%%/rulesets/mason/world/tasks/Heaping.py -%%DATADIR%%/rulesets/mason/world/tasks/IronSmelting.py -%%DATADIR%%/rulesets/mason/world/tasks/Logging.py -%%DATADIR%%/rulesets/mason/world/tasks/Pioneering.py -%%DATADIR%%/rulesets/mason/world/tasks/Pioneeringconstruction.py -%%DATADIR%%/rulesets/mason/world/tasks/Pulling.py -%%DATADIR%%/rulesets/mason/world/tasks/Raise.py -%%DATADIR%%/rulesets/mason/world/tasks/Ram.py -%%DATADIR%%/rulesets/mason/world/tasks/Reap.py -%%DATADIR%%/rulesets/mason/world/tasks/Repairing.py -%%DATADIR%%/rulesets/mason/world/tasks/Sharpen.py -%%DATADIR%%/rulesets/mason/world/tasks/Sift.py -%%DATADIR%%/rulesets/mason/world/tasks/Slaughter.py -%%DATADIR%%/rulesets/mason/world/tasks/Slice.py -%%DATADIR%%/rulesets/mason/world/tasks/Spell.py -%%DATADIR%%/rulesets/mason/world/tasks/Trailblaze.py -%%DATADIR%%/rulesets/mason/world/tasks/Trenching.py -%%DATADIR%%/rulesets/mason/world/tasks/Twirling.py -%%DATADIR%%/rulesets/mason/world/tasks/Woodenwall.py -%%DATADIR%%/rulesets/mason/world/tasks/__init__.py -%%DATADIR%%/rulesets/minimal/define_minimal.py -%%DATADIR%%/rulesets/minimal/world/__init__.py -%%DATADIR%%/rulesets/minimal/world/objects/Weather.py -%%DATADIR%%/rulesets/minimal/world/objects/__init__.py -%%DATADIR%%/rulesets/minimal/world/statistics/Statistics.py -%%DATADIR%%/rulesets/minimal/world/statistics/__init__.py -%%DATADIR%%/scripts/cyphesis/Thing.py -%%DATADIR%%/scripts/cyphesis/__init__.py -%%DATADIR%%/scripts/cyphesis/editor.py -%%DATADIR%%/scripts/cyphesis/probability.py -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/FIXME -%%PORTDOCS%%%%DOCSDIR%%/conf/acorn.xml -%%PORTDOCS%%%%DOCSDIR%%/conf/basic.xml -%%PORTDOCS%%%%DOCSDIR%%/conf/cyphesis.vconf -%%PORTDOCS%%%%DOCSDIR%%/conf/mason.xml -%%PORTDOCS%%%%DOCSDIR%%/conf/werewolf.xml diff --git a/net/gpxe/Makefile b/net/gpxe/Makefile deleted file mode 100644 index a692b82241b1..000000000000 --- a/net/gpxe/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# Created by: Guerkan Karaman <gk.freebsd@googlemail.com> -# $FreeBSD$ - -PORTNAME= gpxe -PORTVERSION= 1.0.1 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://etherboot.org/rel/gpxe/ \ - http://slackware.cs.utah.edu/pub/kernel.org/pub/software/utils/boot/gpxe/ - -MAINTAINER= gk.freebsd@googlemail.com -COMMENT= Open Source (GPL) gPXE network bootloader - -LICENSE= GPLv2 - -BROKEN= does not build on FreeBSD 10.x and later -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2017-01-15 - -BUILD_DEPENDS= syslinux:sysutils/syslinux \ - mkisofs:sysutils/cdrtools - -USES= gmake perl5 -MAKE_ARGS= PERL=${PERL} -WRKSRC= ${WRKDIR}/${DISTNAME}/src - -PLIST_FILES= %%DATADIR%%/gpxe.dsk \ - %%DATADIR%%/gpxe.usb \ - %%DATADIR%%/gpxe.iso - -SUB_FILES= pkg-message - -.include <bsd.port.options.mk> - -ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64/i386 - -.if ${ARCH} == "amd64" -MAKE_ARGS+= ARCH=i386 -.endif - -ISOLINUX_BIN?= ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin - -post-patch: - @${REINPLACE_CMD} "s|%%WRKSRC%%|${WRKSRC}|" ${WRKSRC}/arch/i386/Makefile - -pre-build: -# ISO creation fails if isolinux.bin is read only - ${INSTALL} -m 644 ${ISOLINUX_BIN} ${WRKSRC} - -do-install: - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.dsk ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.usb ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/bin/gpxe.iso ${STAGEDIR}${DATADIR} - -.include <bsd.port.mk> diff --git a/net/gpxe/distinfo b/net/gpxe/distinfo deleted file mode 100644 index 3d87925f7d68..000000000000 --- a/net/gpxe/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gpxe-1.0.1.tar.gz) = 4be98e4f3af5b2000b97f793aceb89f2822ef806575565b3f028a727073de833 -SIZE (gpxe-1.0.1.tar.gz) = 2311752 diff --git a/net/gpxe/files/patch-arch__i386__Makefile b/net/gpxe/files/patch-arch__i386__Makefile deleted file mode 100644 index 930ca9253bbd..000000000000 --- a/net/gpxe/files/patch-arch__i386__Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- ./arch/i386/Makefile.orig 2010-06-29 21:31:33.000000000 +0200 -+++ ./arch/i386/Makefile 2014-02-08 11:45:50.000000000 +0100 -@@ -71,8 +71,7 @@ - # - ISOLINUX_BIN_LIST := \ - $(ISOLINUX_BIN) \ -- /usr/lib/syslinux/isolinux.bin \ -- /usr/share/syslinux/isolinux.bin -+ %%WRKSRC%%/isolinux.bin - ISOLINUX_BIN = $(firstword $(wildcard $(ISOLINUX_BIN_LIST))) - - # i386-specific directories containing source files diff --git a/net/gpxe/files/patch-arch__i386__Makefile.pcbios b/net/gpxe/files/patch-arch__i386__Makefile.pcbios deleted file mode 100644 index 3cd1570e8b94..000000000000 --- a/net/gpxe/files/patch-arch__i386__Makefile.pcbios +++ /dev/null @@ -1,25 +0,0 @@ ---- ./arch/i386/Makefile.pcbios.orig 2010-06-29 21:31:33.000000000 +0200 -+++ ./arch/i386/Makefile.pcbios 2010-08-07 16:51:00.000000000 +0200 -@@ -34,19 +34,19 @@ - NON_AUTO_MEDIA += iso - %iso: %lkrn util/geniso - $(QM)$(ECHO) " [GENISO] $@" -- $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $< -+ $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) sh util/geniso $@ $< - - # rule to make a floppy emulation ISO boot image - NON_AUTO_MEDIA += liso - %liso: %lkrn util/genliso - $(QM)$(ECHO) " [GENLISO] $@" -- $(Q)bash util/genliso $@ $< -+ $(Q)sh util/genliso $@ $< - - # rule to make a syslinux floppy image (mountable, bootable) - NON_AUTO_MEDIA += sdsk - %sdsk: %lkrn util/gensdsk - $(QM)$(ECHO) " [GENSDSK] $@" -- $(Q)bash util/gensdsk $@ $< -+ $(Q)sh util/gensdsk $@ $< - - # Special target for building Master Boot Record binary - $(BIN)/mbr.bin : $(BIN)/mbr.o diff --git a/net/gpxe/files/patch-util__fnrec.sh b/net/gpxe/files/patch-util__fnrec.sh deleted file mode 100644 index 379298111c31..000000000000 --- a/net/gpxe/files/patch-util__fnrec.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- ./util/fnrec.sh.orig 2010-06-29 21:31:33.000000000 +0200 -+++ ./util/fnrec.sh 2010-08-07 16:16:04.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Copyright (C) 2010 Stefan Hajnoczi <stefanha@gmail.com>. - # diff --git a/net/gpxe/files/patch-util__geniso b/net/gpxe/files/patch-util__geniso deleted file mode 100644 index fcfe32f3f646..000000000000 --- a/net/gpxe/files/patch-util__geniso +++ /dev/null @@ -1,17 +0,0 @@ ---- ./util/geniso.orig 2010-06-29 21:31:33.000000000 +0200 -+++ ./util/geniso 2010-08-07 17:45:13.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Generate a isolinux ISO boot image - # -@@ -50,7 +50,7 @@ - fi - b=$(basename $f) - g=${b%.lkrn} -- g=${g//[^a-z0-9]}.krn -+ g=$(echo $g | sed -e 's/[^a-z0-9]//g').krn - case "$first" in - "") - echo DEFAULT $g diff --git a/net/gpxe/files/patch-util__genliso b/net/gpxe/files/patch-util__genliso deleted file mode 100644 index 38f0f99c3f44..000000000000 --- a/net/gpxe/files/patch-util__genliso +++ /dev/null @@ -1,19 +0,0 @@ ---- ./util/genliso.orig 2010-06-29 21:31:33.000000000 +0200 -+++ ./util/genliso 2010-08-07 17:45:23.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Generate a legacy floppy emulation ISO boot image - # -@@ -49,8 +49,8 @@ - # shorten name for 8.3 filesystem - b=$(basename $f) - g=${b%.lkrn} -- g=${g//[^a-z0-9]} -- g=${g:0:8}.krn -+ g=$(echo $g | sed -e 's/[^a-z0-9]//g').krn -+ g=$(echo $g | awk '{print substr($0,0,8)}').krn - case "$first" in - "") - echo DEFAULT $g diff --git a/net/gpxe/files/patch-util__gensdsk b/net/gpxe/files/patch-util__gensdsk deleted file mode 100644 index 543bce70fdbc..000000000000 --- a/net/gpxe/files/patch-util__gensdsk +++ /dev/null @@ -1,19 +0,0 @@ ---- ./util/gensdsk.orig 2010-06-29 21:31:33.000000000 +0200 -+++ ./util/gensdsk 2010-08-07 17:45:31.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Generate a syslinux floppy that loads a gPXE image - # -@@ -44,8 +44,8 @@ - # shorten name for 8.3 filesystem - b=$(basename $f) - g=${b%.lkrn} -- g=${g//[^a-z0-9]} -- g=${g:0:8}.krn -+ g=$(echo $g | sed -e 's/[^a-z0-9]//g').krn -+ g=$(echo $g | awk '{print substr($0,0,8)}').krn - case "$first" in - "") - echo DEFAULT $g diff --git a/net/gpxe/files/pkg-message.in b/net/gpxe/files/pkg-message.in deleted file mode 100644 index ae5c0c0d93e9..000000000000 --- a/net/gpxe/files/pkg-message.in +++ /dev/null @@ -1,19 +0,0 @@ - -The following files have been installed in %%PREFIX%%/share/gpxe - -- gpxe.dsk - To create a bootable floppy, type - cat %%PREFIX%%/share/gpxe/gpxe.dsk > /dev/fd0 - where /dev/fd0 is your floppy drive. - This will erase any data already on the disk. - -- gpxe.usb - To create a bootable USB key, type - cat %%PREFIX%%/share/gpxe/gpxe.usb > /dev/sdX - where /dev/sdX is your USB key, and is *not* a real hard - disk on your system. - This will erase any data already on the USB key. - -- gpxe.iso - To create a bootable CD-ROM, burn the ISO image - %%PREFIX%%/share/gpxe/gpxe.iso to a blank CD-ROM. diff --git a/net/gpxe/pkg-descr b/net/gpxe/pkg-descr deleted file mode 100644 index 7a3fa017f011..000000000000 --- a/net/gpxe/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -gPXE is an open-source PXE implementation and bootloader. - -Create network booting code that allows computers to load -their operating system from a network or to extend an -existing PXE implementation with support for additional -protocols, such iSCSI, HTTP, TFTP, NFS, FTP and ATA -over Ethernet. - -WWW: http://etherboot.org/wiki/index.php diff --git a/net/openospfd/Makefile b/net/openospfd/Makefile deleted file mode 100644 index b9cbe0bf8e0e..000000000000 --- a/net/openospfd/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# $FreeBSD$ - -PORTNAME= openospfd -PORTVERSION= 4.3 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= OPENBSD/OpenBGPD:openbsd \ - LOCAL/flz/openospfd/:freebsd -DISTFILES= ${DISTNAME}.tgz:openbsd \ - if_media.h:freebsd -DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTNAME}.tgz - -MAINTAINER= rea@FreeBSD.org -COMMENT= Free implementation of the Open Shortest Path First Protocol - -LICENSE= ISCL - -BROKEN= requires old CARP implementation (interface layer) -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2017-01-15 - -CONFLICTS= zebra-0* quagga-0* - -LIB_DEPENDS= libevent.so:devel/libevent2 - -MAKE_ENV= BINDIR="${PREFIX}/sbin" \ - MANDIR="${PREFIX}/man/man" -COPTS= -I${LOCALBASE}/include -DMD5_DIGEST_LENGTH=16 -LDADD= -L${LOCALBASE}/lib -levent -lmd -NO_WRKSUBDIR= yes -USE_RC_SUBR= ${PORTNAME} -USERS= _ospfd -GROUPS= _ospfd - -PLIST_FILES= sbin/ospfctl \ - sbin/ospfd \ - man/man5/ospfd.conf.5.gz \ - man/man8/ospfctl.8.gz \ - man/man8/ospfd.8.gz - -post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/ospfctl/ - -post-patch: - @${REINPLACE_CMD} -e "s|<net/if_media\.h>|\"if_media.h\"|" \ - ${WRKSRC}/ospfctl/ospfctl.c - @${REINPLACE_CMD} -e "/rc.conf.local/d" ${WRKSRC}/ospfd/ospfd.conf.5 - @${REINPLACE_CMD} -e "s|SIMPLEQ|STAILQ|" ${WRKSRC}/ospfd/*.[chy] - @${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" \ - ${WRKSRC}/ospfd/ospfd.h \ - ${WRKSRC}/ospfd/ospfd.8 \ - ${WRKSRC}/ospfd/ospfd.conf.5 - @${REINPLACE_CMD} -e "s|__dead|__dead2|" \ - ${WRKSRC}/ospfd/log.h \ - ${WRKSRC}/ospfd/ospfd.c \ - ${WRKSRC}/ospfctl/ospfctl.c - -.include <bsd.port.options.mk> - -do-build: -.for subdir in ospfd ospfctl - ${MAKE_CMD} -C ${WRKSRC}/${subdir} COPTS="${COPTS}" LDADD="${LDADD}" -.endfor - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ospfctl/ospfctl ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/ospfctl/ospfctl.8 \ - ${STAGEDIR}${PREFIX}/man/man8 - ${INSTALL_PROGRAM} ${WRKSRC}/ospfd/ospfd ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/ospfd/ospfd.conf.5 \ - ${STAGEDIR}${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/ospfd/ospfd.8 ${STAGEDIR}${PREFIX}/man/man8 - -.include <bsd.port.mk> diff --git a/net/openospfd/distinfo b/net/openospfd/distinfo deleted file mode 100644 index 0193f9f997dc..000000000000 --- a/net/openospfd/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (openospfd/openospfd-4.3.tgz) = 8fd4ffb393cc06f5936e9eb444b54f72d3fb7ec27285d0d746de5e8050959a66 -SIZE (openospfd/openospfd-4.3.tgz) = 97515 -SHA256 (openospfd/if_media.h) = 58225d0ed363c2beb23426f0f8254089d4541c3334776f3750ba434d4491a1d1 -SIZE (openospfd/if_media.h) = 23762 diff --git a/net/openospfd/files/openospfd.in b/net/openospfd/files/openospfd.in deleted file mode 100644 index 723e18db4b77..000000000000 --- a/net/openospfd/files/openospfd.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: ospfd -# REQUIRE: LOGIN abi -# BEFORE: securelevel -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable openospfd: -# -# openospfd_enable="YES" -# openospfd_flags="<set as needed>" -# -# See ospfd(8) for openospfd_flags - -. /etc/rc.subr - -name="openospfd" -rcvar=openospfd_enable - -extra_commands="reload" -command="%%PREFIX%%/sbin/ospfd" -required_files="%%PREFIX%%/etc/ospfd.conf" - -load_rc_config "$name" -: ${openospfd_enable="NO"} - -run_rc_command "$1" diff --git a/net/openospfd/files/patch-RTF_LLINFO-ARP-v2-fix b/net/openospfd/files/patch-RTF_LLINFO-ARP-v2-fix deleted file mode 100644 index 1bc2a955fecb..000000000000 --- a/net/openospfd/files/patch-RTF_LLINFO-ARP-v2-fix +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/ospfd/kroute.c b/ospfd/kroute.c -index b46fa30..acc2a32 100644 ---- ospfd/kroute.c -+++ ospfd/kroute.c -@@ -1174,8 +1174,10 @@ fetchtable(void) - if ((sa = rti_info[RTAX_DST]) == NULL) - continue; - -+#if defined(RTF_LLINFO) /* FreeBSD dropped RTF_LLINFO after ARP-v2 rework */ - if (rtm->rtm_flags & RTF_LLINFO) /* arp cache */ - continue; -+#endif /* defined(RTF_LLINFO) */ - - if ((kr = calloc(1, sizeof(struct kroute_node))) == NULL) { - log_warn("fetchtable"); -@@ -1371,8 +1373,10 @@ dispatch_rtmsg(void) - if (rtm->rtm_errno) /* failed attempts... */ - continue; - -+#if defined(RTF_LLINFO) /* FreeBSD dropped RTF_LLINFO after ARP-v2 rework */ - if (rtm->rtm_flags & RTF_LLINFO) /* arp cache */ - continue; -+#endif /* defined(RTF_LLINFO) */ - - #ifdef RTF_MPATH - if (rtm->rtm_flags & RTF_MPATH) diff --git a/net/openospfd/files/patch-fix-libevent-READ-WRITE b/net/openospfd/files/patch-fix-libevent-READ-WRITE deleted file mode 100644 index f08a720a4bd8..000000000000 --- a/net/openospfd/files/patch-fix-libevent-READ-WRITE +++ /dev/null @@ -1,271 +0,0 @@ -diff --git a/ospfd/libevent_helpers.h b/ospfd/libevent_helpers.h -new file mode 100644 -index 0000000..46f743d ---- /dev/null -+++ ospfd/libevent_helpers.h -@@ -0,0 +1,81 @@ -+/* -+ * Copyright (c) 2008 Eygene Ryabinkin <rea-fbsd@codelabs.ru> -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#ifndef _LIBEVENT_HELPERS_H_ -+#define _LIBEVENT_HELPERS_H_ -+ -+#include <stdio.h> -+#include <sys/types.h> -+ -+#include "log.h" -+#include "ospfd.h" -+ -+/* Inline functions */ -+ -+/* -+ * A support function that processes libevent notification in the -+ * following way: -+ * - if we are ready to write, we will try to flush the queue; -+ * - if we are ready to read, we will read the input buffer and -+ * prepare variables 'n' and 'shut' accordingly. -+ * -+ * Such handling occurs at least 6 times within the OSPFD sources, -+ * so this inline function is just an alternative to the preprocessor -+ * macros. -+ * -+ * Function returns 0 if everything was handled and no further -+ * processing is needed; it returns EV_READ if the read processing -+ * was prepared to take place. -+ */ -+static inline short -+dispatch_read_write_event(short _event, struct imsgbuf *_ibuf, -+ ssize_t *_n, int *_shut) __attribute__((always_inline)); -+ -+static inline short -+dispatch_read_write_event(short event, struct imsgbuf *ibuf, -+ ssize_t *n, int *shut) -+{ -+ static char errbuf[128]; -+ -+ /* -+ * We can have both EV_READ and EV_WRITE, since we can be -+ * subscribed to both event types. Handle write readiness -+ * first (flush the queue) and then handle reads. -+ */ -+ if ((event & ~(EV_WRITE|EV_READ))) { -+ snprintf(errbuf, sizeof(errbuf), -+ "unknown event 0x%hx", (unsigned short)event); -+ fatalx(errbuf); -+ } -+ -+ if ((event & EV_WRITE)) { -+ if (msgbuf_write(&ibuf->w) == -1) -+ fatal("msgbuf_write"); -+ imsg_event_add(ibuf); -+ } -+ if ((event & EV_READ)) { -+ if ((*n = imsg_read(ibuf)) == -1) -+ fatal("imsg_read error"); -+ if (*n == 0) /* connection closed */ -+ *shut = 1; -+ return EV_READ; -+ } else { -+ return 0; -+ } -+ /* NOTREACHED */ -+} -+ -+#endif /* _LIBEVENT_HELPERS_H_ */ -diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c -index be69cab..4e62d09 100644 ---- ospfd/ospfd.c -+++ ospfd/ospfd.c -@@ -46,6 +46,7 @@ - #include "control.h" - #include "log.h" - #include "rde.h" -+#include "libevent_helpers.h" - - void main_sig_handler(int, short, void *); - __dead void usage(void); -@@ -355,21 +356,8 @@ main_dispatch_ospfe(int fd, short event, void *bula) - ssize_t n; - int shut = 0; - -- switch (event) { -- case EV_READ: -- if ((n = imsg_read(ibuf)) == -1) -- fatal("imsg_read error"); -- if (n == 0) /* connection closed */ -- shut = 1; -- break; -- case EV_WRITE: -- if (msgbuf_write(&ibuf->w) == -1) -- fatal("msgbuf_write"); -- imsg_event_add(ibuf); -+ if (dispatch_read_write_event(event, ibuf, &n, &shut) != EV_READ) - return; -- default: -- fatalx("unknown event"); -- } - - for (;;) { - if ((n = imsg_get(ibuf, &imsg)) == -1) -@@ -434,21 +422,8 @@ main_dispatch_rde(int fd, short event, void *bula) - ssize_t n; - int count, shut = 0; - -- switch (event) { -- case EV_READ: -- if ((n = imsg_read(ibuf)) == -1) -- fatal("imsg_read error"); -- if (n == 0) /* connection closed */ -- shut = 1; -- break; -- case EV_WRITE: -- if (msgbuf_write(&ibuf->w) == -1) -- fatal("msgbuf_write"); -- imsg_event_add(ibuf); -+ if (dispatch_read_write_event(event, ibuf, &n, &shut) != EV_READ) - return; -- default: -- fatalx("unknown event"); -- } - - for (;;) { - if ((n = imsg_get(ibuf, &imsg)) == -1) -diff --git a/ospfd/ospfe.c b/ospfd/ospfe.c -index af7a406..d6a6aa9 100644 ---- ospfd/ospfe.c -+++ ospfd/ospfe.c -@@ -42,6 +42,7 @@ - #include "rde.h" - #include "control.h" - #include "log.h" -+#include "libevent_helpers.h" - - void ospfe_sig_handler(int, short, void *); - void ospfe_shutdown(void); -@@ -257,23 +258,11 @@ ospfe_dispatch_main(int fd, short event, void *bula) - struct iface *iface = NULL; - struct kif *kif; - struct auth_md md; -- int n, link_ok, stub_changed, shut = 0; -- -- switch (event) { -- case EV_READ: -- if ((n = imsg_read(ibuf)) == -1) -- fatal("imsg_read error"); -- if (n == 0) /* connection closed */ -- shut = 1; -- break; -- case EV_WRITE: -- if (msgbuf_write(&ibuf->w) == -1) -- fatal("msgbuf_write"); -- imsg_event_add(ibuf); -+ int link_ok, stub_changed, shut = 0; -+ ssize_t n; -+ -+ if (dispatch_read_write_event(event, ibuf, &n, &shut) != EV_READ) - return; -- default: -- fatalx("unknown event"); -- } - - for (;;) { - if ((n = imsg_get(ibuf, &imsg)) == -1) -@@ -401,24 +390,12 @@ ospfe_dispatch_rde(int fd, short event, void *bula) - struct lsa_entry *le; - struct imsg imsg; - struct abr_rtr ar; -- int n, noack = 0, shut = 0; -+ int noack = 0, shut = 0; - u_int16_t l, age; -+ ssize_t n; - -- switch (event) { -- case EV_READ: -- if ((n = imsg_read(ibuf)) == -1) -- fatal("imsg_read error"); -- if (n == 0) /* connection closed */ -- shut = 1; -- break; -- case EV_WRITE: -- if (msgbuf_write(&ibuf->w) == -1) -- fatal("msgbuf_write"); -- imsg_event_add(ibuf); -+ if (dispatch_read_write_event(event, ibuf, &n, &shut) != EV_READ) - return; -- default: -- fatalx("unknown event"); -- } - - for (;;) { - if ((n = imsg_get(ibuf, &imsg)) == -1) -diff --git a/ospfd/rde.c b/ospfd/rde.c -index 5dd0623..faa0c23 100644 ---- ospfd/rde.c -+++ ospfd/rde.c -@@ -37,6 +37,7 @@ - #include "ospfe.h" - #include "log.h" - #include "rde.h" -+#include "libevent_helpers.h" - - void rde_sig_handler(int sig, short, void *); - void rde_shutdown(void); -@@ -239,21 +240,8 @@ rde_dispatch_imsg(int fd, short event, void *bula) - int r, state, self, shut = 0; - u_int16_t l; - -- switch (event) { -- case EV_READ: -- if ((n = imsg_read(ibuf)) == -1) -- fatal("imsg_read error"); -- if (n == 0) /* connection closed */ -- shut = 1; -- break; -- case EV_WRITE: -- if (msgbuf_write(&ibuf->w) == -1) -- fatal("msgbuf_write"); -- imsg_event_add(ibuf); -+ if (dispatch_read_write_event(event, ibuf, &n, &shut) != EV_READ) - return; -- default: -- fatalx("unknown event"); -- } - - clock_gettime(CLOCK_MONOTONIC, &tp); - now = tp.tv_sec; -@@ -584,21 +572,8 @@ rde_dispatch_parent(int fd, short event, void *bula) - ssize_t n; - int shut = 0; - -- switch (event) { -- case EV_READ: -- if ((n = imsg_read(ibuf)) == -1) -- fatal("imsg_read error"); -- if (n == 0) /* connection closed */ -- shut = 1; -- break; -- case EV_WRITE: -- if (msgbuf_write(&ibuf->w) == -1) -- fatal("msgbuf_write"); -- imsg_event_add(ibuf); -+ if (dispatch_read_write_event(event, ibuf, &n, &shut) != EV_READ) - return; -- default: -- fatalx("unknown event"); -- } - - for (;;) { - if ((n = imsg_get(ibuf, &imsg)) == -1) diff --git a/net/openospfd/files/patch-ospfctl_parser.c b/net/openospfd/files/patch-ospfctl_parser.c deleted file mode 100644 index ad85723e6850..000000000000 --- a/net/openospfd/files/patch-ospfctl_parser.c +++ /dev/null @@ -1,26 +0,0 @@ ---- ospfctl/parser.c.orig 2008-02-07 19:13:50.000000000 +0300 -+++ ospfctl/parser.c 2008-02-07 19:15:47.000000000 +0300 -@@ -32,23 +32,6 @@ - - #include "parser.h" - --enum token_type { -- NOTOKEN, -- ENDTOKEN, -- KEYWORD, -- ADDRESS, -- FLAG, -- PREFIX, -- IFNAME --}; -- --struct token { -- enum token_type type; -- const char *keyword; -- int value; -- const struct token *next; --}; -- - static const struct token t_main[]; - static const struct token t_fib[]; - static const struct token t_show[]; diff --git a/net/openospfd/files/patch-ospfctl_parser.h b/net/openospfd/files/patch-ospfctl_parser.h deleted file mode 100644 index 677bee2809f2..000000000000 --- a/net/openospfd/files/patch-ospfctl_parser.h +++ /dev/null @@ -1,33 +0,0 @@ ---- ospfctl/parser.h.orig 2008-02-07 19:12:58.000000000 +0300 -+++ ospfctl/parser.h 2008-02-07 19:15:45.000000000 +0300 -@@ -50,6 +50,16 @@ - RELOAD - }; - -+enum token_type { -+ NOTOKEN, -+ ENDTOKEN, -+ KEYWORD, -+ ADDRESS, -+ FLAG, -+ PREFIX, -+ IFNAME -+}; -+ - struct parse_result { - struct in_addr addr; - char ifname[IF_NAMESIZE]; -@@ -58,6 +68,13 @@ - u_int8_t prefixlen; - }; - -+struct token { -+ enum token_type type; -+ const char *keyword; -+ int value; -+ const struct token *next; -+}; -+ - struct parse_result *parse(int, char *[]); - const struct token *match_token(const char *, const struct token []); - void show_valid_args(const struct token []); diff --git a/net/openospfd/files/patch-ospfd_carp.c b/net/openospfd/files/patch-ospfd_carp.c deleted file mode 100644 index 798643bf5cfc..000000000000 --- a/net/openospfd/files/patch-ospfd_carp.c +++ /dev/null @@ -1,22 +0,0 @@ ---- ospfd/carp.c.orig 2008-02-07 18:26:32.000000000 +0300 -+++ ospfd/carp.c 2008-02-07 18:39:58.000000000 +0300 -@@ -29,6 +29,13 @@ - #include "ospfd.h" - #include "log.h" - -+#if defined(__FreeBSD__) /* XXX: FreeBSD has no CARP demotion support */ -+ -+#warning "CARP demotion is not supported for FreeBSD." -+#warning "Demotion code is disconnected from the build." -+ -+#else -+ - struct carpgroup { - TAILQ_ENTRY(carpgroup) entry; - char *group; -@@ -179,3 +186,5 @@ - close(s); - return (res); - } -+ -+#endif /* defined(__FreeBSD__) */ diff --git a/net/openospfd/files/patch-ospfd_kroute.c b/net/openospfd/files/patch-ospfd_kroute.c deleted file mode 100644 index 3cea2b6b9661..000000000000 --- a/net/openospfd/files/patch-ospfd_kroute.c +++ /dev/null @@ -1,149 +0,0 @@ ---- ospfd/kroute.c.orig 2009-04-29 15:07:32.000000000 -0400 -+++ ospfd/kroute.c 2009-04-29 15:07:57.000000000 -0400 -@@ -1024,9 +1024,11 @@ - struct sockaddr_in prefix; - struct sockaddr_in nexthop; - struct sockaddr_in mask; -+#if !defined(__FreeBSD__) - struct sockaddr_rtlabel sa_rl; -- int iovcnt = 0; - const char *label; -+#endif /* !defined(__FreeBSD__) */ -+ int iovcnt = 0; - - if (kr_state.fib_sync == 0) - return (0); -@@ -1035,7 +1037,12 @@ - bzero(&hdr, sizeof(hdr)); - hdr.rtm_version = RTM_VERSION; - hdr.rtm_type = action; -+#if !defined(__FreeBSD__) - hdr.rtm_flags = RTF_PROTO2|RTF_MPATH; -+#else -+ /* No multipath routing in FreeBSD yet */ -+ hdr.rtm_flags = RTF_PROTO2; -+#endif /* !defined(__FreeBSD__) */ - if (action == RTM_CHANGE) /* force PROTO2 reset the other flags */ - hdr.rtm_fmask = RTF_PROTO2|RTF_PROTO1|RTF_REJECT|RTF_BLACKHOLE; - hdr.rtm_seq = kr_state.rtseq++; /* overflow doesn't matter */ -@@ -1080,6 +1087,7 @@ - iov[iovcnt].iov_base = &mask; - iov[iovcnt++].iov_len = sizeof(mask); - -+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling. */ - if (kroute->rtlabel != 0) { - sa_rl.sr_len = sizeof(sa_rl); - sa_rl.sr_family = AF_UNSPEC; -@@ -1096,6 +1104,7 @@ - iov[iovcnt].iov_base = &sa_rl; - iov[iovcnt++].iov_len = sizeof(sa_rl); - } -+#endif /* !defined(__FreeBSD__) */ - - - retry: -@@ -1138,7 +1147,9 @@ - struct rt_msghdr *rtm; - struct sockaddr *sa, *rti_info[RTAX_MAX]; - struct sockaddr_in *sa_in; -+#if !defined(__FreeBSD__) - struct sockaddr_rtlabel *label; -+#endif - struct kroute_node *kr; - - mib[0] = CTL_NET; -@@ -1147,9 +1158,13 @@ - mib[3] = AF_INET; - mib[4] = NET_RT_DUMP; - mib[5] = 0; -+#if !defined(__FreeBSD__) /* FreeBSD has no multiple routing tables */ - mib[6] = 0; /* rtableid */ - - if (sysctl(mib, 7, NULL, &len, NULL, 0) == -1) { -+#else -+ if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1) { -+#endif /* !defined(__FreeBSD__) */ - log_warn("sysctl"); - return (-1); - } -@@ -1157,7 +1172,11 @@ - log_warn("fetchtable"); - return (-1); - } -+#if !defined(__FreeBSD__) /* FreeBSD has no multiple routing tables */ - if (sysctl(mib, 7, buf, &len, NULL, 0) == -1) { -+#else -+ if (sysctl(mib, 6, buf, &len, NULL, 0) == -1) { -+#endif /* !defined(__FreeBSD__) */ - log_warn("sysctl"); - free(buf); - return (-1); -@@ -1230,6 +1249,7 @@ - send_rtmsg(kr_state.fd, RTM_DELETE, &kr->r); - free(kr); - } else { -+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling. */ - if ((label = (struct sockaddr_rtlabel *) - rti_info[RTAX_LABEL]) != NULL) { - kr->r.rtlabel = -@@ -1237,6 +1257,7 @@ - kr->r.ext_tag = - rtlabel_id2tag(kr->r.rtlabel); - } -+#endif /* !defined(__FreeBSD__) */ - kroute_insert(kr); - } - -@@ -1330,7 +1351,9 @@ - struct ifa_msghdr *ifam; - struct sockaddr *sa, *rti_info[RTAX_MAX]; - struct sockaddr_in *sa_in; -+#if !defined(__FreeBSD__) - struct sockaddr_rtlabel *label; -+#endif /* !defined(__FreeBSD__) */ - struct kroute_node *kr, *okr; - struct in_addr prefix, nexthop; - u_int8_t prefixlen; -@@ -1364,8 +1387,10 @@ - sa = (struct sockaddr *)(rtm + 1); - get_rtaddrs(rtm->rtm_addrs, sa, rti_info); - -+#if !defined(__FreeBSD__) /* XXX: FreeBSD has no multiple routing tables */ - if (rtm->rtm_tableid != 0) - continue; -+#endif - - if (rtm->rtm_pid == kr_state.pid) /* caused by us */ - continue; -@@ -1462,6 +1487,7 @@ - rtlabel_unref(kr->r.rtlabel); - kr->r.rtlabel = 0; - kr->r.ext_tag = 0; -+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling. */ - if ((label = (struct sockaddr_rtlabel *) - rti_info[RTAX_LABEL]) != NULL) { - kr->r.rtlabel = -@@ -1469,6 +1495,7 @@ - kr->r.ext_tag = - rtlabel_id2tag(kr->r.rtlabel); - } -+#endif /* !defined(__FreeBSD__) */ - - if (kif_validate(kr->r.ifindex)) - kr->r.flags &= ~F_DOWN; -@@ -1490,6 +1517,7 @@ - kr->r.flags = flags; - kr->r.ifindex = ifindex; - -+#if !defined(__FreeBSD__) /* FreeBSD has no route labeling */ - if ((label = (struct sockaddr_rtlabel *) - rti_info[RTAX_LABEL]) != NULL) { - kr->r.rtlabel = -@@ -1497,6 +1525,7 @@ - kr->r.ext_tag = - rtlabel_id2tag(kr->r.rtlabel); - } -+#endif /* !defined(__FreeBSD__) */ - - kroute_insert(kr); - } diff --git a/net/openospfd/files/patch-ospfd_ospfd.c b/net/openospfd/files/patch-ospfd_ospfd.c deleted file mode 100644 index 419eb4f77c37..000000000000 --- a/net/openospfd/files/patch-ospfd_ospfd.c +++ /dev/null @@ -1,27 +0,0 @@ ---- ospfd/ospfd.c.orig 2008-02-07 18:31:27.000000000 +0300 -+++ ospfd/ospfd.c 2008-02-07 18:41:46.000000000 +0300 -@@ -300,7 +300,9 @@ - - control_cleanup(); - kr_shutdown(); -+#if !defined(__FreeBSD__) /* XXX: FreeBSD has no carp demotion. */ - carp_demote_shutdown(); -+#endif /* defined(__FreeBSD__) */ - - do { - if ((pid = wait(NULL)) == -1 && -@@ -398,10 +400,14 @@ - log_warnx("IFINFO request with wrong len"); - break; - case IMSG_DEMOTE: -+#if !defined(__FreeBSD__) /* XXX: FreeBSD has no carp demotion support. */ - if (imsg.hdr.len - IMSG_HEADER_SIZE != sizeof(dmsg)) - fatalx("invalid size of OE request"); - memcpy(&dmsg, imsg.data, sizeof(dmsg)); - carp_demote_set(dmsg.demote_group, dmsg.level); -+#else -+ log_debug("main_dispatch_ospfe: no carp demotion support for FreeBSD"); -+#endif /* defined(__FreeBSD__) */ - break; - default: - log_debug("main_dispatch_ospfe: error handling imsg %d", diff --git a/net/openospfd/files/patch-ospfd_ospfd.h b/net/openospfd/files/patch-ospfd_ospfd.h deleted file mode 100644 index bcd1f6d85eff..000000000000 --- a/net/openospfd/files/patch-ospfd_ospfd.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ospfd/ospfd.h.orig 2008-02-07 18:57:03.000000000 +0300 -+++ ospfd/ospfd.h 2008-02-07 18:56:54.000000000 +0300 -@@ -320,6 +320,10 @@ - TAILQ_HEAD(lsa_head, lsa_entry); - TAILQ_HEAD(auth_md_head, auth_md); - -+#if defined(__FreeBSD__) /* FreeBSD has no LINK_STATE_IS_UP macro. */ -+#define LINK_STATE_IS_UP(_s) ((_s) >= LINK_STATE_UP) -+#endif /* defined(__FreeBSD__) */ -+ - struct iface { - LIST_ENTRY(iface) entry; - struct event hello_timer; diff --git a/net/openospfd/files/patch-ospfd_packet.c b/net/openospfd/files/patch-ospfd_packet.c deleted file mode 100644 index cceb30283f86..000000000000 --- a/net/openospfd/files/patch-ospfd_packet.c +++ /dev/null @@ -1,39 +0,0 @@ ---- ospfd/packet.c.orig 2006-11-17 11:55:31.000000000 +0300 -+++ ospfd/packet.c 2008-02-13 22:13:04.000000000 +0300 -@@ -36,7 +36,7 @@ - #include "log.h" - #include "ospfe.h" - --int ip_hdr_sanity_check(const struct ip *, u_int16_t); -+int ip_hdr_sanity_check(struct ip *, u_int16_t); - int ospf_hdr_sanity_check(const struct ip *, - struct ospf_hdr *, u_int16_t, const struct iface *); - struct iface *find_iface(struct ospfd_conf *, unsigned int, struct in_addr); -@@ -70,7 +70,12 @@ - ip_hdr.ip_v = IPVERSION; - ip_hdr.ip_hl = sizeof(ip_hdr) >> 2; - ip_hdr.ip_tos = IPTOS_PREC_INTERNETCONTROL; -+#if defined(__FreeBSD__) || defined(__NetBSD__) -+ /* FreeBSD/NetBSD wants the length in the native host byte order. */ -+ ip_hdr.ip_len = len + sizeof(ip_hdr); -+#else - ip_hdr.ip_len = htons(len + sizeof(ip_hdr)); -+#endif - ip_hdr.ip_id = 0; /* 0 means kernel set appropriate value */ - ip_hdr.ip_off = 0; - ip_hdr.ip_ttl = iface->type != IF_TYPE_VIRTUALLINK ? -@@ -248,8 +253,13 @@ - } - - int --ip_hdr_sanity_check(const struct ip *ip_hdr, u_int16_t len) -+ip_hdr_sanity_check(struct ip *ip_hdr, u_int16_t len) - { -+#if defined(__NetBSD__) || defined(__FreeBSD__) -+ /* FreeBSD and NetBSD modify the IP header. Undo it! */ -+ ip_hdr->ip_len = htons(ip_hdr->ip_len + (ip_hdr->ip_hl << 2)); -+#endif -+ - if (ntohs(ip_hdr->ip_len) != len) { - log_debug("recv_packet: invalid IP packet length %u", - ntohs(ip_hdr->ip_len)); diff --git a/net/openospfd/files/patch-ospfd_parse.y b/net/openospfd/files/patch-ospfd_parse.y deleted file mode 100644 index 6c40c3e64460..000000000000 --- a/net/openospfd/files/patch-ospfd_parse.y +++ /dev/null @@ -1,42 +0,0 @@ ---- ospfd/parse.y.orig 2008-02-26 13:09:58.000000000 +0300 -+++ ospfd/parse.y 2008-12-19 17:52:39.000000000 +0300 -@@ -503,6 +503,11 @@ - - areaoptsl : interface - | DEMOTE STRING demotecount { -+#ifdef __FreeBSD__ /* XXX: FreeBSD has no carp demotion support. */ -+ yyerror("FreeBSD has no CARP demotion support"); -+ free($2); -+ YYERROR; -+#else - if ($3 < 1 || $3 > 255) { - yyerror("demote count out of range (1-255)"); - free($2); -@@ -523,6 +528,7 @@ - area->demote_group); - YYERROR; - } -+#endif - } - | defaults - ; -@@ -599,6 +605,11 @@ - - interfaceoptsl : PASSIVE { iface->passive = 1; } - | DEMOTE STRING { -+#ifdef __FreeBSD__ /* XXX: FreeBSD has no carp demotion support */ -+ yyerror("FreeBSD has no CARP demotion support"); -+ free($2); -+ YYERROR; -+#else - if (strlcpy(iface->demote_group, $2, - sizeof(iface->demote_group)) >= - sizeof(iface->demote_group)) { -@@ -613,6 +624,7 @@ - iface->demote_group); - YYERROR; - } -+#endif - } - | defaults - ; diff --git a/net/openospfd/pkg-descr b/net/openospfd/pkg-descr deleted file mode 100644 index 373f08866741..000000000000 --- a/net/openospfd/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -OpenOSPFD is a FREE implementation of the Open Shortest Path First Protocol. -It allows ordinary machines to be used as routers exchanging routes with -other systems speaking the OSPF protocol. - -WWW: http://www.openbgp.org/ diff --git a/security/Makefile b/security/Makefile index 54f16747f974..d02940e2f227 100644 --- a/security/Makefile +++ b/security/Makefile @@ -403,7 +403,6 @@ SUBDIR += oinkmaster SUBDIR += op SUBDIR += openbsm - SUBDIR += openbsm-devel SUBDIR += openca-tools-forked SUBDIR += opencdk SUBDIR += openconnect @@ -1103,7 +1102,6 @@ SUBDIR += sqlninja SUBDIR += srm SUBDIR += ssdeep - SUBDIR += ssh-copy-id SUBDIR += ssh-multiadd SUBDIR += ssh_askpass_gtk2 SUBDIR += sshblock diff --git a/security/openbsm-devel/Makefile b/security/openbsm-devel/Makefile deleted file mode 100644 index 766676fa8fda..000000000000 --- a/security/openbsm-devel/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# Created by: Ryan Steinmetz <zi@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= openbsm -DISTVERSION= 1.2-alpha4 -CATEGORIES= security -MASTER_SITES= http://www.trustedbsd.org/downloads/ \ - http://mirrors.rit.edu/zi/ -PKGNAMESUFFIX= -devel - -MAINTAINER= zi@FreeBSD.org -COMMENT= Open Source Basic Security Module (BSM) Audit Implementation - -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -IGNORE= is not needed under FreeBSD 10.x or higher -DEPRECATED= ${IGNORE} -EXPIRATION_DATE= 2017-01-15 - -CONFLICTS= openbsm-1.[0-9]* - -GNU_CONFIGURE= yes -USES= libtool tar:tgz -USE_LDCONFIG= yes - -USE_RC_SUBR= auditdistd -SUB_FILES= pkg-message -PLIST_SUB= USERS=${USERS} GROUPS=${GROUPS} NEEDVARDIRS=${NEEDVARDIRS} - -USERS= auditdistd -GROUPS= audit - -VARAUDIT= /var/audit - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 902000 -NEEDVARDIRS= "" -.else -NEEDVARDIRS= "@comment " -.endif - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libauditd.so.0.0.0 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbsm.so.0.0.0 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/auditfilter_noop.so.0.0.0 -.if ${OSVERSION} < 902000 - @${MKDIR} -m 0770 \ - ${STAGEDIR}${VARAUDIT}/dist ${STAGEDIR}${VARAUDIT}/remote -.endif - -.include <bsd.port.post.mk> diff --git a/security/openbsm-devel/distinfo b/security/openbsm-devel/distinfo deleted file mode 100644 index e3213bba772f..000000000000 --- a/security/openbsm-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (openbsm-1.2-alpha4.tgz) = 35b0370d19a742a387f10aaae187a38abee536d8a7b57c0e9d997d3ceaf02429 -SIZE (openbsm-1.2-alpha4.tgz) = 699451 diff --git a/security/openbsm-devel/files/auditdistd.in b/security/openbsm-devel/files/auditdistd.in deleted file mode 100644 index c8c56f7a6114..000000000000 --- a/security/openbsm-devel/files/auditdistd.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: auditdistd -# REQUIRE: auditd -# BEFORE: DAEMON -# KEYWORD: nojail shutdown - -. /etc/rc.subr - -name="auditdistd" -rcvar="${name}_enable" -pidfile="/var/run/${name}.pid" -command="%%PREFIX%%/sbin/${name}" -required_files="/etc/security/${name}.conf" -extra_commands="reload" - -load_rc_config $name -run_rc_command "$1" diff --git a/security/openbsm-devel/files/patch-bin__auditdistd__subr.c b/security/openbsm-devel/files/patch-bin__auditdistd__subr.c deleted file mode 100644 index cee5f9cd3865..000000000000 --- a/security/openbsm-devel/files/patch-bin__auditdistd__subr.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./bin/auditdistd/subr.c.orig 2014-08-25 09:03:45.000000000 -0400 -+++ ./bin/auditdistd/subr.c 2014-08-25 09:05:35.000000000 -0400 -@@ -228,6 +228,10 @@ - PJDLOG_ASSERT(fd != -1); - - #ifdef HAVE_KQUEUE -+ if (wait_for_file_kq != -1) { -+ close(wait_for_file_kq); -+ wait_for_file_kq = -1; -+ } - kq = kqueue(); - if (kq == -1) { - pjdlog_errno(LOG_WARNING, "kqueue() failed"); diff --git a/security/openbsm-devel/files/pkg-message.in b/security/openbsm-devel/files/pkg-message.in deleted file mode 100644 index 39cd289f9ccd..000000000000 --- a/security/openbsm-devel/files/pkg-message.in +++ /dev/null @@ -1,74 +0,0 @@ -=============================================================================== - -Additional configuration is required if you wish to use auditdistd: - -On the receiver, perform the following: - -1. Generate a certificate: -# openssl req -x509 -nodes -newkey rsa:4096 -days 1825 -batch \ - -out /etc/security/auditdistd.cert.pem \ - -keyout /etc/security/auditdistd.key.pem -# chmod 0600 /etc/security/auditdistd.key.pem /etc/security/auditdistd.cert.pem -# chown root:wheel /etc/security/auditdistd.key.pem /etc/security/auditdistd.cert.pem - -2. Print out the public key's fingerprint: -# openssl x509 -in /etc/security/auditdistd.cert.pem -noout -fingerprint -sha256 | \ - awk -F '[ =]' '{printf("%s=%s\n", $1, $3)}' -SHA256=8F:0A:FC:8A:3D:09:80:AF:D9:AA:38:CC:8A:86:53:E6:8F:B6:1C:55:30... - -3. Generate a password used to authenticate both hosts against eachother: -# dd if=/dev/urandom bs=32 count=1 | openssl base64 | cut -b -32 -YjwbK69H5cEBlhcT+eJpJgJTFn5B2SrG - -4. Create /etc/security/auditdistd.conf configuration file: -receiver { - host "<enter hostname of sender here> { - remote "tls://<enter IP of sender here>" - password "<enter password generated above here>" - } -} - -5. Update permissions on the auditdistd configuration file and create directory: -# chmod 600 /etc/security/auditdistd.conf -# chown root:wheel /etc/security/auditdistd.conf -# mkdir -m 700 /var/audit/remote ; chown auditdistd:wheel /var/audit/remote - -6. Add the following to /etc/rc.conf: -auditdistd_enable="YES" - -7. Start auditdistd: -service auditdistd start - -=============================================================================== - -On the sender, perform the following: - -1. Ensure your kernel is compiled with: -options AUDIT - -2. Add the following to /etc/rc.conf: -auditd_enable="YES" -auditd_program="%%PREFIX%%/sbin/auditd" -auditdistd_enable="YES" - -3. Add the following to /etc/security/audit_control: -dist:on - -4. Create /etc/security/auditdistd.conf configuration file: -sender { - host "<enter hostname of receiver here>" { - remote "tls://<enter IP of the receiver here>" - fingerprint "SHA256=8F:0A:FC:8A:3D:09:80:AF:D9:AA:38:CC:8A:86:..." - password "<enter password generated above here>" - } -} - -5. Create the required directories: -# mkdir -m 0770 /var/audit/dist ; chown auditdistd:audit /var/audit/dist - -6. Start the required daemons: -service auditd start && service auditdistd start - -Additional information regarding auditdistd may be found on the OpenBSM wiki: -https://wiki.freebsd.org/auditdistd -=============================================================================== diff --git a/security/openbsm-devel/pkg-descr b/security/openbsm-devel/pkg-descr deleted file mode 100644 index a915207564c7..000000000000 --- a/security/openbsm-devel/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -OpenBSM is an open source implementation of Sun's Basic Security Module (BSM) -Audit API and file format. BSM, the de facto industry standard for Audit, -describes a set of system call and library interfaces for managing audit -records, as well as a token stream file format that permits extensible and -generalized audit trail processing. OpenBSM extends the BSM API and file -format in a number of ways to support features present in the Mac OS X and -FreeBSD operating systems, such as Mach task interfaces, sendfile(), and -Linux system calls present in the FreeBSD Linux emulation layer. - -WWW: http://www.trustedbsd.org/openbsm.html diff --git a/security/openbsm-devel/pkg-plist b/security/openbsm-devel/pkg-plist deleted file mode 100644 index e42e6c705314..000000000000 --- a/security/openbsm-devel/pkg-plist +++ /dev/null @@ -1,179 +0,0 @@ -include/bsm/audit.h -include/bsm/audit_domain.h -include/bsm/audit_errno.h -include/bsm/audit_fcntl.h -include/bsm/audit_filter.h -include/bsm/audit_internal.h -include/bsm/audit_kevents.h -include/bsm/audit_record.h -include/bsm/audit_socket_type.h -include/bsm/audit_uevents.h -include/bsm/auditd_lib.h -include/bsm/libbsm.h -lib/auditfilter_noop.a -lib/auditfilter_noop.so -lib/auditfilter_noop.so.0 -lib/auditfilter_noop.so.0.0.0 -lib/libauditd.a -lib/libauditd.so -lib/libauditd.so.0 -lib/libauditd.so.0.0.0 -lib/libbsm.a -lib/libbsm.so -lib/libbsm.so.0 -lib/libbsm.so.0.0.0 -man/ac_strtopol.3.gz -man/au_bsm_to_domain.3.gz -man/au_bsm_to_errno.3.gz -man/au_bsm_to_fcntl_cmd.3.gz -man/au_bsm_to_socket_type.3.gz -man/au_close.3.gz -man/au_close_buffer.3.gz -man/au_close_token.3.gz -man/au_domain_to_bsm.3.gz -man/au_errno_to_bsm.3.gz -man/au_fcntl_cmd_to_bsm.3.gz -man/au_fetch_tok.3.gz -man/au_get_state.3.gz -man/au_notify_initialize.3.gz -man/au_notify_terminate.3.gz -man/au_open.3.gz -man/au_poltostr.3.gz -man/au_preselect.3.gz -man/au_print_flags_tok.3.gz -man/au_print_tok.3.gz -man/au_read_rec.3.gz -man/au_socket_type_to_bsm.3.gz -man/au_strerror.3.gz -man/au_to_arg.3.gz -man/au_to_arg32.3.gz -man/au_to_arg64.3.gz -man/au_to_attr64.3.gz -man/au_to_data.3.gz -man/au_to_exec_args.3.gz -man/au_to_exec_env.3.gz -man/au_to_exit.3.gz -man/au_to_file.3.gz -man/au_to_groups.3.gz -man/au_to_header.3.gz -man/au_to_header32.3.gz -man/au_to_header32_ex.3.gz -man/au_to_header64.3.gz -man/au_to_header_ex.3.gz -man/au_to_in_addr.3.gz -man/au_to_in_addr_ex.3.gz -man/au_to_ip.3.gz -man/au_to_ipc.3.gz -man/au_to_ipc_perm.3.gz -man/au_to_iport.3.gz -man/au_to_me.3.gz -man/au_to_newgroups.3.gz -man/au_to_opaque.3.gz -man/au_to_path.3.gz -man/au_to_process.3.gz -man/au_to_process32.3.gz -man/au_to_process32_ex.3.gz -man/au_to_process64.3.gz -man/au_to_process64_ex.3.gz -man/au_to_process_ex.3.gz -man/au_to_return.3.gz -man/au_to_return32.3.gz -man/au_to_return64.3.gz -man/au_to_seq.3.gz -man/au_to_sock_inet.3.gz -man/au_to_sock_inet128.3.gz -man/au_to_sock_inet32.3.gz -man/au_to_socket_ex.3.gz -man/au_to_subject.3.gz -man/au_to_subject32.3.gz -man/au_to_subject32_ex.3.gz -man/au_to_subject64.3.gz -man/au_to_subject64_ex.3.gz -man/au_to_subject_ex.3.gz -man/au_to_text.3.gz -man/au_to_trailer.3.gz -man/au_to_zonename.3.gz -man/au_user_mask.3.gz -man/au_write.3.gz -man/endac.3.gz -man/endauclass.3.gz -man/endauevent.3.gz -man/endauuser.3.gz -man/getacdir.3.gz -man/getacdist.3.gz -man/getacexpire.3.gz -man/getacfilesz.3.gz -man/getacflg.3.gz -man/getachost.3.gz -man/getacmin.3.gz -man/getacna.3.gz -man/getacpol.3.gz -man/getauclassent.3.gz -man/getauclassent_r.3.gz -man/getauclassnam.3.gz -man/getauclassnam_r.3.gz -man/getaudit_addr.2.gz -man/getauditflagsbin.3.gz -man/getauditflagschar.3.gz -man/getauevent.3.gz -man/getauevent_r.3.gz -man/getauevnam.3.gz -man/getauevnam_r.3.gz -man/getauevnonam.3.gz -man/getauevnonam_r.3.gz -man/getauevnum.3.gz -man/getauevnum_r.3.gz -man/getauuserent.3.gz -man/getauuserent_r.3.gz -man/getauusernam.3.gz -man/getauusernam_r.3.gz -man/getfauditflags.3.gz -man/man1/auditreduce.1.gz -man/man1/praudit.1.gz -man/man2/audit.2.gz -man/man2/auditctl.2.gz -man/man2/auditon.2.gz -man/man2/getaudit.2.gz -man/man2/getauid.2.gz -man/man2/setaudit.2.gz -man/man2/setauid.2.gz -man/man3/au_class.3.gz -man/man3/au_control.3.gz -man/man3/au_domain.3.gz -man/man3/au_errno.3.gz -man/man3/au_event.3.gz -man/man3/au_fcntl_cmd.3.gz -man/man3/au_free_token.3.gz -man/man3/au_io.3.gz -man/man3/au_mask.3.gz -man/man3/au_notify.3.gz -man/man3/au_open.3.gz -man/man3/au_socket_type.3.gz -man/man3/au_token.3.gz -man/man3/au_user.3.gz -man/man3/libauditd.3.gz -man/man3/libbsm.3.gz -man/man5/audit.log.5.gz -man/man5/audit_class.5.gz -man/man5/audit_control.5.gz -man/man5/audit_event.5.gz -man/man5/audit_user.5.gz -man/man5/audit_warn.5.gz -man/man5/auditdistd.conf.5.gz -man/man8/audit.8.gz -man/man8/auditd.8.gz -man/man8/auditdistd.8.gz -man/man8/auditfilterd.8.gz -man/setac.3.gz -man/setauclass.3.gz -man/setaudit_addr.2.gz -man/setauevent.3.gz -man/setauuser.3.gz -sbin/audit -sbin/auditd -sbin/auditdistd -sbin/auditfilterd -sbin/auditreduce -sbin/praudit -%%NEEDVARDIRS%%@dir(%%USERS%%,%%GROUPS%%,770) /var/audit/dist -%%NEEDVARDIRS%%@dir(%%USERS%%,%%GROUPS%%,700) /var/audit/remote diff --git a/security/ssh-copy-id/Makefile b/security/ssh-copy-id/Makefile deleted file mode 100644 index ddbc4db2e728..000000000000 --- a/security/ssh-copy-id/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Emanuel Haupt <ehaupt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= ssh-copy-id -PORTVERSION= 5.6p1 -CATEGORIES= security -MASTER_SITES= # none -DISTFILES= # none - -MAINTAINER= ehaupt@FreeBSD.org -COMMENT= Small script which copies your ssh public-key to a remote host - -IGNORE= is already in the base system -DEPRECATED= ${IGNORE} -EXPIRATION_DATE= 2017-01-15 - -NO_BUILD= yes - -PLIST_FILES= bin/ssh-copy-id man/man1/ssh-copy-id.1.gz - -.include <bsd.port.pre.mk> - -pre-patch: -.for f in ssh-copy-id ssh-copy-id.1 - @${CP} ${FILESDIR}/${f} ${WRKDIR} -.endfor - -do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 - -.include <bsd.port.post.mk> diff --git a/security/ssh-copy-id/files/ssh-copy-id b/security/ssh-copy-id/files/ssh-copy-id deleted file mode 100644 index 368645cb4fc7..000000000000 --- a/security/ssh-copy-id/files/ssh-copy-id +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -# Shell script to install your public key on a remote machine -# Takes the remote machine name as an argument. -# Obviously, the remote machine must accept password authentication, -# or one of the other keys in your ssh-agent, for this to work. - -ID_FILE="${HOME}/.ssh/id_rsa.pub" - -if [ "-i" = "$1" ]; then - shift - # check if we have 2 parameters left, if so the first is the new ID file - if [ -n "$2" ]; then - if expr "$1" : ".*\.pub" > /dev/null ; then - ID_FILE="$1" - else - ID_FILE="$1.pub" - fi - shift # and this should leave $1 as the target name - fi -else - if [ x$SSH_AUTH_SOCK != x ] && ssh-add -L >/dev/null 2>&1; then - GET_ID="$GET_ID ssh-add -L" - fi -fi - -if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then - GET_ID="cat ${ID_FILE}" -fi - -if [ -z "`eval $GET_ID`" ]; then - echo "$0: ERROR: No identities found" >&2 - exit 1 -fi - -if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then - echo "Usage: $0 [-i [identity_file]] [user@]machine" >&2 - exit 1 -fi - -# strip any trailing colon -host=`echo $1 | sed 's/:$//'` - -{ eval "$GET_ID" ; } | ssh $host "umask 077; test -d ~/.ssh || mkdir ~/.ssh ; cat >> ~/.ssh/authorized_keys" || exit 1 - -cat <<EOF -Now try logging into the machine, with "ssh '$host'", and check in: - - ~/.ssh/authorized_keys - -to make sure we haven't added extra keys that you weren't expecting. - -EOF - diff --git a/security/ssh-copy-id/files/ssh-copy-id.1 b/security/ssh-copy-id/files/ssh-copy-id.1 deleted file mode 100644 index cb15ab24dbc4..000000000000 --- a/security/ssh-copy-id/files/ssh-copy-id.1 +++ /dev/null @@ -1,75 +0,0 @@ -.ig \" -*- nroff -*- -Copyright (c) 1999 Philip Hands Computing <http://www.hands.com/> - -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. - -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the -entire resulting derived work is distributed under the terms of a -permission notice identical to this one. - -Permission is granted to copy and distribute translations of this -manual into another language, under the above conditions for modified -versions, except that this permission notice may be included in -translations approved by the Free Software Foundation instead of in -the original English. -.. -.TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" -.SH NAME -ssh-copy-id \- install your public key in a remote machine's authorized_keys -.SH SYNOPSIS -.B ssh-copy-id [-i [identity_file]] -.I "[user@]machine" -.br -.SH DESCRIPTION -.BR ssh-copy-id -is a script that uses ssh to log into a remote machine and -append the indicated identity file to that machine's -.B ~/.ssh/authorized_keys -file. -.PP -If the -.B -i -option is given then the identity file (defaults to -.BR ~/.ssh/id_rsa.pub ) -is used, regardless of whether there are any keys in your -.BR ssh-agent . -Otherwise, if this: -.PP -.B " ssh-add -L" -.PP -provides any output, it uses that in preference to the identity file. -.PP -If the -.B -i -option is used, or the -.B ssh-add -produced no output, then it uses the contents of the identity -file. Once it has one or more fingerprints (by whatever means) it -uses ssh to append them to -.B ~/.ssh/authorized_keys -on the remote machine (creating the file, and directory, if necessary.) - -.SH NOTES -This program does not modify the permissions of any -pre-existing files or directories. Therefore, if the remote -.B sshd -has -.B StrictModes -set in its -configuration, then the user's home, -.B ~/.ssh -folder, and -.B ~/.ssh/authorized_keys -file may need to have group writability disabled manually, e.g. via - -.B " chmod go-w ~ ~/.ssh ~/.ssh/authorized_keys" - -on the remote machine. - -.SH "SEE ALSO" -.BR ssh (1), -.BR ssh-agent (1), -.BR sshd (8) diff --git a/security/ssh-copy-id/pkg-descr b/security/ssh-copy-id/pkg-descr deleted file mode 100644 index ba4e65b56682..000000000000 --- a/security/ssh-copy-id/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -ssh-copy-id is a small script which copies your ssh public-key to a remote host; -appending it to your remote authorized_keys. - -WWW: http://www.openssh.com/portable.html diff --git a/sysutils/Makefile b/sysutils/Makefile index afc76e9de297..bdf5c11fa96c 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -40,7 +40,6 @@ SUBDIR += apachetop SUBDIR += apcpwr SUBDIR += apcupsd - SUBDIR += apt SUBDIR += arcconf SUBDIR += archivemount SUBDIR += areca-cli diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile deleted file mode 100644 index e3a1069203ba..000000000000 --- a/sysutils/apt/Makefile +++ /dev/null @@ -1,126 +0,0 @@ -# Created by: Nick Barkas <snb@threerings.net> -# $FreeBSD$ - -PORTNAME= apt -PORTVERSION= 0.6.46.4.1 -PORTREVISION= 9 -CATEGORIES= sysutils -MASTER_SITES= DEBIAN_POOL -DISTNAME= apt_0.6.46.4-0.1 - -MAINTAINER= koobs@FreeBSD.org -COMMENT= Advanced front-end for dpkg - -BROKEN= does not build on 10+ -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2017-01-15 - -BUILD_DEPENDS= bash:shells/bash \ - ${LOCALBASE}/lib/libpub.a:devel/publib -RUN_DEPENDS:= ${BUILD_DEPENDS} \ - dpkg:archivers/dpkg \ - gpg:security/gnupg1 -LIB_DEPENDS= libcurl.so:ftp/curl - -GNU_CONFIGURE= yes -USES= bdb gettext iconv gmake shebangfix -SHEBANG_FILES= dselect/install \ - dselect/setup \ - dselect/update -USE_LDCONFIG= yes -NO_FILTER_SHLIBS= yes -CPPFLAGS+= -I${LOCALBASE}/include/db${BDB_VER} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/db${BDB_VER} -L${LOCALBASE}/lib -WRKSRC= ${WRKDIR}/apt-${PORTVERSION} - -DPKGDIR?= /var/db/dpkg -APTDIR?= /var/db/apt -PLIST_SUB+= APTDIR=${APTDIR:C,^/,,} - -.include <bsd.port.pre.mk> - -post-patch: - ${CP} ${FILESDIR}/https.cc ${FILESDIR}/https.h ${WRKSRC}/methods/ - ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' -e \ - 's|@APTDIR@|${APTDIR}|g' -e 's|@DPKGDIR@|${DPKGDIR}|g' -e \ - 's|@LOCALBASE@|${LOCALBASE}|g' \ - ${WRKSRC}/apt-pkg/deb/debsystem.cc \ - ${WRKSRC}/apt-pkg/init.cc \ - ${WRKSRC}/cmdline/apt-key \ - ${WRKSRC}/dselect/install \ - ${WRKSRC}/dselect/setup \ - ${WRKSRC}/dselect/update \ - ${WRKSRC}/methods/gpgv.cc - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cache ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cdrom ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-config ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-extracttemplates ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-ftparchive ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-get ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-sortpkgs ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/apt-key ${STAGEDIR}${PREFIX}/bin - - ${INSTALL_DATA} ${WRKSRC}/bin/libapt-inst.so.1.1.0 ${STAGEDIR}${PREFIX}/lib - (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so.1.1; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so) - ${INSTALL_DATA} ${WRKSRC}/bin/libapt-pkg.so.3.11.0 ${STAGEDIR}${PREFIX}/lib - (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so.3.11; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so) - - @${MKDIR} ${STAGEDIR}${PREFIX}/share/apt/keyrings - - @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/cdrom ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/copy ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/file ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/ftp ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gpgv ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gzip ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/http ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/https ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rred ${STAGEDIR}${PREFIX}/libexec/apt/methods - ${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rsh ${STAGEDIR}${PREFIX}/libexec/apt/methods - (cd ${STAGEDIR}${PREFIX}/libexec/apt/methods; ${LN} -sf rsh ssh; ${LN} -sf gzip bzip2) - - @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt - ${INSTALL_DATA} ${WRKSRC}/scripts/dselect/desc.apt ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt - ${INSTALL_DATA} ${WRKSRC}/scripts/dselect/names ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/install ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/setup ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/update ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt - - @${MKDIR} ${STAGEDIR}${PREFIX}/include/apt-pkg - ${INSTALL_DATA} ${WRKSRC}/include/apt-pkg/* ${STAGEDIR}${PREFIX}/include/apt-pkg - - ${INSTALL_MAN} ${WRKSRC}/docs/apt-extracttemplates.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/docs/apt-ftparchive.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/docs/apt-sortpkgs.1 ${STAGEDIR}${MANPREFIX}/man/man1 - - ${INSTALL_MAN} ${WRKSRC}/docs/apt.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/docs/apt_preferences.5 ${STAGEDIR}${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/docs/sources.list.5 ${STAGEDIR}${MANPREFIX}/man/man5 - - ${INSTALL_MAN} ${WRKSRC}/docs/apt-cache.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/docs/apt-cdrom.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/docs/apt-config.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/docs/apt-get.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/docs/apt-key.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/docs/apt-secure.8 ${STAGEDIR}${MANPREFIX}/man/man8 - - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/apt/conf.d - ${INSTALL_DATA} ${WRKSRC}/docs/examples/sources.list ${STAGEDIR}${PREFIX}/etc/apt/sources.list.sample - ${INSTALL_DATA} ${WRKSRC}/docs/examples/apt.conf ${STAGEDIR}${PREFIX}/etc/apt/apt.conf.sample - - @${MKDIR} ${STAGEDIR}${APTDIR}/cache/archives/partial - @${MKDIR} ${STAGEDIR}${APTDIR}/state/lists/partial - - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/COPYING.GPL ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README.progress-reporting ${STAGEDIR}${DOCSDIR} - - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/docs/examples/* ${STAGEDIR}${EXAMPLESDIR} - -.include <bsd.port.post.mk> diff --git a/sysutils/apt/distinfo b/sysutils/apt/distinfo deleted file mode 100644 index b5e87555666d..000000000000 --- a/sysutils/apt/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (apt_0.6.46.4-0.1.tar.gz) = fab35a62d43d4a3942be095befecb60fc35bd58df43bcd1b9fa11efb497d4429 -SIZE (apt_0.6.46.4-0.1.tar.gz) = 1797866 diff --git a/sysutils/apt/files/https.cc b/sysutils/apt/files/https.cc deleted file mode 100644 index b2bbbddb1987..000000000000 --- a/sysutils/apt/files/https.cc +++ /dev/null @@ -1,273 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ -/* ###################################################################### - - HTTPS Acquire Method - This is the HTTPS aquire method for APT. - - It uses libcurl - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include <apt-pkg/fileutl.h> -#include <apt-pkg/acquire-method.h> -#include <apt-pkg/error.h> -#include <apt-pkg/hashes.h> - -#include <sys/stat.h> -#include <sys/time.h> -#include <utime.h> -#include <unistd.h> -#include <signal.h> -#include <stdio.h> -#include <errno.h> -#include <string.h> -#include <iostream> -#include <apti18n.h> -#include <sstream> - -#include "config.h" -#include "https.h" - - /*}}}*/ -using namespace std; - -size_t -HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp) -{ - HttpsMethod *me = (HttpsMethod *)userp; - - if(me->File->Write(buffer, size*nmemb) != true) - return false; - - return size*nmemb; -} - -int -HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, - double ultotal, double ulnow) -{ - HttpsMethod *me = (HttpsMethod *)clientp; - if(dltotal > 0 && me->Res.Size == 0) { - me->Res.Size = (unsigned long)dltotal; - me->URIStart(me->Res); - } - return 0; -} - -void HttpsMethod::SetupProxy() -{ - URI ServerName = Queue->Uri; - - // Determine the proxy setting - if (getenv("http_proxy") == 0) - { - string DefProxy = _config->Find("Acquire::http::Proxy"); - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (SpecificProxy.empty() == false) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - Proxy = DefProxy; - } - - // Parse no_proxy, a , separated list of domains - if (getenv("no_proxy") != 0) - { - if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) - Proxy = ""; - } - - // Determine what host and port to use based on the proxy settings - string Host; - if (Proxy.empty() == true || Proxy.Host.empty() == true) - { - } - else - { - if (Proxy.Port != 0) - curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); - curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); - } -} - - -// HttpsMethod::Fetch - Fetch an item /*{{{*/ -// --------------------------------------------------------------------- -/* This adds an item to the pipeline. We keep the pipeline at a fixed - depth. */ -bool HttpsMethod::Fetch(FetchItem *Itm) -{ - stringstream ss; - struct stat SBuf; - struct curl_slist *headers=NULL; - char curl_errorstr[CURL_ERROR_SIZE]; - long curl_responsecode; - - // TODO: - // - http::Timeout - // - http::Pipeline-Depth - // - error checking/reporting - // - more debug options? (CURLOPT_DEBUGFUNCTION?) - - curl_easy_reset(curl); - SetupProxy(); - - // callbacks - curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str()); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, this); - curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback); - curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this); - curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); - curl_easy_setopt(curl, CURLOPT_FILETIME, true); - - // FIXME: https: offer various options of verification - bool peer_verify = _config->FindB("Acquire::https::Verify-Peer", false); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, peer_verify); - - // sslcert file - string pem = _config->Find("Acquire::https::SslCert",""); - if(pem != "") - curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str()); - - // CA-Dir - string certdir = _config->Find("Acquire::https::CaPath",""); - if(certdir != "") - curl_easy_setopt(curl, CURLOPT_CAPATH, certdir.c_str()); - - // Server-verify - int verify = _config->FindI("Acquire::https::Verify-Host",2); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify); - - // cache-control - if(_config->FindB("Acquire::http::No-Cache",false) == false) - { - // cache enabled - if (_config->FindB("Acquire::http::No-Store",false) == true) - headers = curl_slist_append(headers,"Cache-Control: no-store"); - ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0)); - headers = curl_slist_append(headers, ss.str().c_str()); - } else { - // cache disabled by user - headers = curl_slist_append(headers, "Cache-Control: no-cache"); - headers = curl_slist_append(headers, "Pragma: no-cache"); - } - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - - // speed limit - int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; - if (dlLimit > 0) - curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); - - // set header - curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); - - // debug - if(_config->FindB("Debug::Acquire::https", false)) - curl_easy_setopt(curl, CURLOPT_VERBOSE, true); - - // error handling - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr); - - // if we have the file send an if-range query with a range header - if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) - { - char Buf[1000]; - sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n", - (long)SBuf.st_size - 1, - TimeRFC1123(SBuf.st_mtime).c_str()); - headers = curl_slist_append(headers, Buf); - } - else if(Itm->LastModified > 0) - { - curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified); - } - - // go for it - if the file exists, append on it - File = new FileFd(Itm->DestFile, FileFd::WriteAny); - if (File->Size() > 0) - File->Seek(File->Size() - 1); - - // keep apt updated - Res.Filename = Itm->DestFile; - - // get it! - CURLcode success = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &curl_responsecode); - - long curl_servdate; - curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate); - - // cleanup - if(success != 0) - { - unlink(File->Name().c_str()); - _error->Error(curl_errorstr); - Fail(); - return true; - } - File->Close(); - - // Timestamp - struct utimbuf UBuf; - if (curl_servdate != -1) { - UBuf.actime = curl_servdate; - UBuf.modtime = curl_servdate; - utime(File->Name().c_str(),&UBuf); - } - - // check the downloaded result - struct stat Buf; - if (stat(File->Name().c_str(),&Buf) == 0) - { - Res.Filename = File->Name(); - Res.LastModified = Buf.st_mtime; - Res.IMSHit = false; - if (curl_responsecode == 304) - { - unlink(File->Name().c_str()); - Res.IMSHit = true; - Res.LastModified = Itm->LastModified; - Res.Size = 0; - URIDone(Res); - return true; - } - Res.Size = Buf.st_size; - } - - // take hashes - Hashes Hash; - FileFd Fd(Res.Filename, FileFd::ReadOnly); - Hash.AddFD(Fd.Fd(), Fd.Size()); - Res.TakeHashes(Hash); - - // keep apt updated - URIDone(Res); - - // cleanup - Res.Size = 0; - delete File; - curl_slist_free_all(headers); - - return true; -}; - -int main() -{ - setlocale(LC_ALL, ""); - - HttpsMethod Mth; - curl_global_init(CURL_GLOBAL_SSL) ; - - return Mth.Run(); -} - - diff --git a/sysutils/apt/files/https.h b/sysutils/apt/files/https.h deleted file mode 100644 index 2c33d95ee10d..000000000000 --- a/sysutils/apt/files/https.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ -// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ -/* ###################################################################### - - HTTP Acquire Method - This is the HTTP aquire method for APT. - - ##################################################################### */ - /*}}}*/ - -#ifndef APT_HTTP_H -#define APT_HTTP_H - -#define MAXLEN 360 - -#include <iostream> -#include <curl/curl.h> - -using std::cout; -using std::endl; - -class HttpsMethod; - - -class HttpsMethod : public pkgAcqMethod -{ - - virtual bool Fetch(FetchItem *); - static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp); - static int progress_callback(void *clientp, double dltotal, double dlnow, - double ultotal, double ulnow); - void SetupProxy(); - CURL *curl; - FetchResult Res; - - public: - FileFd *File; - - HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) - { - File = 0; - curl = curl_easy_init(); - }; -}; - -URI Proxy; - -#endif diff --git a/sysutils/apt/files/patch-apt-pkg__contrib__fileutl.h b/sysutils/apt/files/patch-apt-pkg__contrib__fileutl.h deleted file mode 100644 index f47e1a3e8cfc..000000000000 --- a/sysutils/apt/files/patch-apt-pkg__contrib__fileutl.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ./apt-pkg/contrib/fileutl.h.orig 2014-08-16 19:31:39.000000000 -0400 -+++ ./apt-pkg/contrib/fileutl.h 2014-08-16 19:31:52.000000000 -0400 -@@ -25,6 +25,7 @@ - #pragma interface "apt-pkg/fileutl.h" - #endif - -+#include <sys/types.h> - #include <string> - - using std::string; diff --git a/sysutils/apt/files/patch-apt-pkg_deb_debsystem.cc b/sysutils/apt/files/patch-apt-pkg_deb_debsystem.cc deleted file mode 100644 index 9bed53d71e6e..000000000000 --- a/sysutils/apt/files/patch-apt-pkg_deb_debsystem.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- apt-pkg/deb/debsystem.cc.orig Thu Mar 2 06:11:39 2006 -+++ apt-pkg/deb/debsystem.cc Wed Oct 25 15:09:29 2006 -@@ -162,8 +162,8 @@ - which is yet to be determined. The functions in pkgcachegen should - be the only users of these */ - Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct -- Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status"); -- Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg"); -+ Cnf.CndSet("Dir::State::status","@DPKGDIR@/status"); -+ Cnf.CndSet("Dir::Bin::dpkg","@LOCALBASE@/bin/dpkg"); - - if (StatusFile) { - delete StatusFile; -@@ -191,9 +191,9 @@ - signed debSystem::Score(Configuration const &Cnf) - { - signed Score = 0; -- if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true) -+ if (FileExists(Cnf.FindFile("Dir::State::status","@DPKGDIR@/status")) == true) - Score += 10; -- if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true) -+ if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","@LOCALBASE@/bin/dpkg")) == true) - Score += 10; - if (FileExists("/etc/debian_version") == true) - Score += 10; diff --git a/sysutils/apt/files/patch-apt-pkg_deb_dpkgpm.cc b/sysutils/apt/files/patch-apt-pkg_deb_dpkgpm.cc deleted file mode 100644 index b0481cfc6839..000000000000 --- a/sysutils/apt/files/patch-apt-pkg_deb_dpkgpm.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- apt-pkg/deb/dpkgpm.cc.orig Sat Sep 30 07:17:49 2006 -+++ apt-pkg/deb/dpkgpm.cc Mon Oct 23 13:42:03 2006 -@@ -515,8 +515,8 @@ - it forks scripts. What happens is that when you hit ctrl-c it sends - it to all processes in the group. Since dpkg ignores the signal - it doesn't die but we do! So we must also ignore it */ -- sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN); -- sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN); -+ sig_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN); -+ sig_t old_SIGINT = signal(SIGINT,SIG_IGN); - - // Fork dpkg - pid_t Child; diff --git a/sysutils/apt/files/patch-apt-pkg_init.cc b/sysutils/apt/files/patch-apt-pkg_init.cc deleted file mode 100644 index 22536c70e01c..000000000000 --- a/sysutils/apt/files/patch-apt-pkg_init.cc +++ /dev/null @@ -1,41 +0,0 @@ ---- apt-pkg/init.cc.orig Thu Mar 2 06:27:13 2006 -+++ apt-pkg/init.cc Thu Nov 2 13:36:53 2006 -@@ -43,26 +43,19 @@ - Cnf.Set("Dir","/"); - - // State -- Cnf.Set("Dir::State","var/lib/apt/"); -+ Cnf.Set("Dir::State","@APTDIR@/state"); - -- /* Just in case something goes horribly wrong, we can fall back to the -- old /var/state paths.. */ -- struct stat St; -- if (stat("/var/lib/apt/.",&St) != 0 && -- stat("/var/state/apt/.",&St) == 0) -- Cnf.Set("Dir::State","var/state/apt/"); -- - Cnf.Set("Dir::State::lists","lists/"); - Cnf.Set("Dir::State::cdroms","cdroms.list"); - - // Cache -- Cnf.Set("Dir::Cache","var/cache/apt/"); -+ Cnf.Set("Dir::Cache","@APTDIR@/cache"); - Cnf.Set("Dir::Cache::archives","archives/"); - Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin"); - Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin"); - - // Configuration -- Cnf.Set("Dir::Etc","etc/apt/"); -+ Cnf.Set("Dir::Etc","@PREFIX@/etc/apt/"); - Cnf.Set("Dir::Etc::sourcelist","sources.list"); - Cnf.Set("Dir::Etc::sourceparts","sources.list.d"); - Cnf.Set("Dir::Etc::vendorlist","vendors.list"); -@@ -70,7 +63,7 @@ - Cnf.Set("Dir::Etc::main","apt.conf"); - Cnf.Set("Dir::Etc::parts","apt.conf.d"); - Cnf.Set("Dir::Etc::preferences","preferences"); -- Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); -+ Cnf.Set("Dir::Bin::methods","@PREFIX@/libexec/apt/methods"); - - bool Res = true; - diff --git a/sysutils/apt/files/patch-buildlib_archtable b/sysutils/apt/files/patch-buildlib_archtable deleted file mode 100644 index f1e7c797faf1..000000000000 --- a/sysutils/apt/files/patch-buildlib_archtable +++ /dev/null @@ -1,7 +0,0 @@ ---- buildlib/archtable.orig Thu Mar 2 06:26:52 2006 -+++ buildlib/archtable Wed Nov 15 13:08:39 2006 -@@ -27,3 +27,4 @@ - s390 s390 - s390x s390x - x86_64 amd64 -+amd64 amd64 diff --git a/sysutils/apt/files/patch-buildlib_environment.mak.in b/sysutils/apt/files/patch-buildlib_environment.mak.in deleted file mode 100644 index 37a651b7a066..000000000000 --- a/sysutils/apt/files/patch-buildlib_environment.mak.in +++ /dev/null @@ -1,18 +0,0 @@ ---- buildlib/environment.mak.in.orig Thu Mar 2 05:56:30 2006 -+++ buildlib/environment.mak.in Wed Oct 25 15:51:02 2006 -@@ -65,7 +65,14 @@ - ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) - SONAME_MAGIC=-Wl,-soname -Wl, - LFLAGS_SO= --else -+endif -+ -+ifneq ($(words $(filter freebsd% %freebsd,$(HOST_OS))),0) -+ SONAME_MAGIC=-Wl,-soname -Wl, -+ LFLAGS_SO= -+endif -+ -+ifndef SONAME_MAGIC - # Do not know how to create shared libraries here. - ONLYSTATICLIBS = yes - endif diff --git a/sysutils/apt/files/patch-buildlib_ostable b/sysutils/apt/files/patch-buildlib_ostable deleted file mode 100644 index 831d2481ebef..000000000000 --- a/sysutils/apt/files/patch-buildlib_ostable +++ /dev/null @@ -1,10 +0,0 @@ ---- buildlib/ostable.orig Thu Mar 2 05:46:44 2006 -+++ buildlib/ostable Wed Oct 25 14:58:59 2006 -@@ -16,6 +16,7 @@ - hp-hpux[^-]* hp-ux - sun-solaris[^-]* solaris - [^-]*-openbsd[^-]* openbsd -+[^-]*-freebsd[^-]* freebsd - - # Catch all - .* unknown diff --git a/sysutils/apt/files/patch-cmdline_apt-key b/sysutils/apt/files/patch-cmdline_apt-key deleted file mode 100644 index 995618da7416..000000000000 --- a/sysutils/apt/files/patch-cmdline_apt-key +++ /dev/null @@ -1,26 +0,0 @@ ---- cmdline/apt-key.orig Thu Mar 2 06:28:27 2006 -+++ cmdline/apt-key Tue Oct 24 16:11:08 2006 -@@ -5,18 +5,17 @@ - # We don't use a secret keyring, of course, but gpg panics and - # implodes if there isn't one available - --GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" --GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -+GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring @PREFIX@/etc/apt/secring.gpg --trustdb-name @PREFIX@/etc/apt/trustdb.gpg" -+GPG="$GPG_CMD --keyring @PREFIX@/etc/apt/trusted.gpg" - - --ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg --REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg -+ARCHIVE_KEYRING=@PREFIX@/share/apt/keyrings/freebsd-archive-keyring.gpg -+REMOVED_KEYS=@PREFIX@/share/apt/keyrings/freebsd-archive-removed-keys.gpg - - - update() { - if [ ! -f $ARCHIVE_KEYRING ]; then -- echo >&2 "ERROR: Can't find the archive-keyring" -- echo >&2 "Is the debian-archive-keyring package installed?" -+ echo >&2 "ERROR: Can't find the archive-keyring: $ARCHIVE_KEYRING" - exit 1 - fi - diff --git a/sysutils/apt/files/patch-cmdline_makefile b/sysutils/apt/files/patch-cmdline_makefile deleted file mode 100644 index bb14b5632a3c..000000000000 --- a/sysutils/apt/files/patch-cmdline_makefile +++ /dev/null @@ -1,51 +0,0 @@ ---- cmdline/makefile.orig Thu Mar 2 05:58:42 2006 -+++ cmdline/makefile Mon Oct 23 16:38:13 2006 -@@ -7,42 +7,42 @@ - - # The apt-cache program - PROGRAM=apt-cache --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = apt-cache.cc - include $(PROGRAM_H) - - # The apt-get program - PROGRAM=apt-get --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = apt-get.cc acqprogress.cc - include $(PROGRAM_H) - - # The apt-config program - PROGRAM=apt-config --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = apt-config.cc - include $(PROGRAM_H) - - # The apt-cdrom program - PROGRAM=apt-cdrom --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = apt-cdrom.cc - include $(PROGRAM_H) - - # The apt-sortpkgs program - PROGRAM=apt-sortpkgs --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = apt-sortpkgs.cc - include $(PROGRAM_H) - - # The apt-extracttemplates program - PROGRAM=apt-extracttemplates --SLIBS = -lapt-pkg -lapt-inst -+SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = apt-extracttemplates.cc - include $(PROGRAM_H) diff --git a/sysutils/apt/files/patch-configure b/sysutils/apt/files/patch-configure deleted file mode 100644 index ae108c0cfd24..000000000000 --- a/sysutils/apt/files/patch-configure +++ /dev/null @@ -1,161 +0,0 @@ ---- configure.orig Wed Oct 11 00:03:36 2006 -+++ configure Thu Oct 26 14:32:09 2006 -@@ -7523,8 +7523,8 @@ - - - --{ echo "$as_me:$LINENO: checking for h_errno" >&5 --echo $ECHO_N "checking for h_errno... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking if netdb.h declares h_errno" >&5 -+echo $ECHO_N "checking if netdb.h declares h_errno... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -7533,14 +7533,51 @@ - /* end confdefs.h. */ - #include <netdb.h> - -+int main() { return h_errno; } -+ - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "h_errno" >/dev/null 2>&1; then -- { echo "$as_me:$LINENO: result: normal" >&5 --echo "${ECHO_T}normal" >&6; } -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+ aptget_cv_netdb_declares_h_errno=yes -+ - else -- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" -- cat >conftest.$ac_ext <<_ACEOF -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ aptget_cv_netdb_declares_h_errno=no -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+if test "x$aptget_cv_netdb_declares_h_errno" = "xno"; then -+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" -+fi -+ -+cat >conftest.$ac_ext <<_ACEOF -+ -+ - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -7548,22 +7585,52 @@ - /* end confdefs.h. */ - #include <netdb.h> - -+int main() { return h_errno; } -+ - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "h_errno" >/dev/null 2>&1; then -- { echo "$as_me:$LINENO: result: needs _XOPEN_SOURCE_EXTENDED" >&5 --echo "${ECHO_T}needs _XOPEN_SOURCE_EXTENDED" >&6; } -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+ aptget_cv_netdb_declares_h_errno=yes -+ - else -- { { echo "$as_me:$LINENO: error: \"not found.\"" >&5 --echo "$as_me: error: \"not found.\"" >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f conftest* -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ aptget_cv_netdb_declares_h_errno=no - - fi --rm -f conftest* -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - -+echo "$as_me:$LINENO: result: $aptget_cv_netdb_declares_h_errno" >&5 -+echo "${ECHO_T}$aptget_cv_netdb_declares_h_errno" >&6 -+ -+if test "x$aptget_cv_netdb_declares_h_errno" = "xno"; then -+ { { echo "$as_me:$LINENO: error: h_errno is required" >&5 -+echo "$as_me: error: h_errno is required" >&2;} -+ { (exit 1); exit 1; }; } -+fi - - # Extract the first word of "debiandoc2html", so it can be a program name with args. - set dummy debiandoc2html; ac_word=$2 -@@ -7942,15 +8009,16 @@ - { echo "$as_me:$LINENO: result: $GLIBC_VER" >&5 - echo "${ECHO_T}$GLIBC_VER" >&6; } - ac_cv_glibc_ver=$GLIBC_VER -+ GLIBC_VER="-$ac_cv_glibc_ver" - else - { echo "$as_me:$LINENO: WARNING: cannot determine GNU C library minor version number" >&5 - echo "$as_me: WARNING: cannot determine GNU C library minor version number" >&2;} -+ GLIBC_VER="" - fi - rm -f $dummy $dummy.c - - fi - -- GLIBC_VER="-$ac_cv_glibc_ver" - - - { echo "$as_me:$LINENO: checking libstdc++ version" >&5 -@@ -11448,7 +11516,7 @@ - ;; - esac - done ;; -- "default":C) make -s dirs ;; -+ "default":C) gmake -s dirs ;; - - esac - done # for ac_tag diff --git a/sysutils/apt/files/patch-doc_examples_sources.list b/sysutils/apt/files/patch-doc_examples_sources.list deleted file mode 100644 index e988da807d76..000000000000 --- a/sysutils/apt/files/patch-doc_examples_sources.list +++ /dev/null @@ -1,14 +0,0 @@ ---- doc/examples/sources.list.orig Tue Sep 12 03:55:21 2006 -+++ doc/examples/sources.list Thu Nov 2 13:52:02 2006 -@@ -1,9 +1,7 @@ - # See sources.list(5) for more information, especialy - # Remember that you can only use http, ftp or file URIs - # CDROMs are managed through the apt-cdrom tool. --deb http://http.us.debian.org/debian stable main contrib non-free --deb http://security.debian.org stable/updates main contrib non-free -+deb http://www.example.com/packages stable main contrib non-free - - # Uncomment if you want the apt-get source function to work --#deb-src http://http.us.debian.org/debian stable main contrib non-free --#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free -+#deb-src http://www.example.com/packages stable main contrib non-free diff --git a/sysutils/apt/files/patch-dselect_install b/sysutils/apt/files/patch-dselect_install deleted file mode 100644 index 3c724ec0df28..000000000000 --- a/sysutils/apt/files/patch-dselect_install +++ /dev/null @@ -1,17 +0,0 @@ ---- dselect/install.orig Thu Mar 2 05:28:29 2006 -+++ dselect/install Wed Oct 25 15:17:58 2006 -@@ -3,11 +3,11 @@ - # Set the textdomain for the translations using $"..." - TEXTDOMAIN="apt" - --# Get the configuration from /etc/apt/apt.conf -+# Get the configuration from @PREFIX@/etc/apt/apt.conf - CLEAN="prompt" - OPTS="-f" --APTGET="/usr/bin/apt-get" --DPKG="/usr/bin/dpkg" -+APTGET="@PREFIX@/bin/apt-get" -+DPKG="@LOCALBASE@/bin/dpkg" - DPKG_OPTS="--admindir=$1" - APT_OPT0="-oDir::State::status=$1/status" - APT_OPT1="-oDPkg::Options::=$DPKG_OPTS" diff --git a/sysutils/apt/files/patch-dselect_setup b/sysutils/apt/files/patch-dselect_setup deleted file mode 100644 index b324cbddc3f0..000000000000 --- a/sysutils/apt/files/patch-dselect_setup +++ /dev/null @@ -1,11 +0,0 @@ ---- dselect/setup.orig Thu Mar 2 05:33:56 2006 -+++ dselect/setup Wed Oct 25 15:18:38 2006 -@@ -23,7 +23,7 @@ - my $vardir=$ARGV[0]; - my $method=$ARGV[1]; - my $option=$ARGV[2]; --my $config_file = '/etc/apt/sources.list'; -+my $config_file = '@PREFIX@/etc/apt/sources.list'; - - my $boldon=`setterm -bold on`; - my $boldoff=`setterm -bold off`; diff --git a/sysutils/apt/files/patch-dselect_update b/sysutils/apt/files/patch-dselect_update deleted file mode 100644 index 48481eb0bff9..000000000000 --- a/sysutils/apt/files/patch-dselect_update +++ /dev/null @@ -1,20 +0,0 @@ ---- dselect/update.orig Thu Mar 2 06:06:31 2006 -+++ dselect/update Wed Oct 25 15:20:34 2006 -@@ -7,13 +7,13 @@ - # Get the configuration from /etc/apt/apt.conf - CLEAN="prompt" - OPTS="-f" --APTGET="/usr/bin/apt-get" --APTCACHE="/usr/bin/apt-cache" --DPKG="/usr/bin/dpkg" -+APTGET="@PREFIX@/bin/apt-get" -+APTCACHE="@PREFIX@/bin/apt-cache" -+DPKG="@LOCALBASE@/bin/dpkg" - DPKG_OPTS="--admindir=$1" - APT_OPT0="-oDir::State::status=$1/status" - APT_OPT1="-oDPkg::Options::=$DPKG_OPTS" --CACHEDIR="/var/cache/apt" -+CACHEDIR="@APTDIR@/cache" - PROMPT="false" - RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \ - DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \ diff --git a/sysutils/apt/files/patch-ftparchive_cachedb.cc b/sysutils/apt/files/patch-ftparchive_cachedb.cc deleted file mode 100644 index 0465d54a4d6b..000000000000 --- a/sysutils/apt/files/patch-ftparchive_cachedb.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- ftparchive/cachedb.cc.orig Tue Jul 25 00:35:54 2006 -+++ ftparchive/cachedb.cc Tue Nov 14 17:06:17 2006 -@@ -25,6 +25,7 @@ - #include <apt-pkg/configuration.h> - - #include <netinet/in.h> // htonl, etc -+#include <publib.h> - /*}}}*/ - - // CacheDB::ReadyDB - Ready the DB2 /*{{{*/ diff --git a/sysutils/apt/files/patch-ftparchive_contents.cc b/sysutils/apt/files/patch-ftparchive_contents.cc deleted file mode 100644 index 94a91855eb32..000000000000 --- a/sysutils/apt/files/patch-ftparchive_contents.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- ftparchive/contents.cc.orig Thu Mar 2 06:06:31 2006 -+++ ftparchive/contents.cc Tue Nov 14 17:13:30 2006 -@@ -41,7 +41,6 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <malloc.h> - /*}}}*/ - - // GenContents::~GenContents - Free allocated memory /*{{{*/ diff --git a/sysutils/apt/files/patch-ftparchive_makefile b/sysutils/apt/files/patch-ftparchive_makefile deleted file mode 100644 index e163f9d30422..000000000000 --- a/sysutils/apt/files/patch-ftparchive_makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ftparchive/makefile.orig Thu Mar 2 05:45:55 2006 -+++ ftparchive/makefile Tue Nov 14 17:19:51 2006 -@@ -8,7 +8,7 @@ - # The apt-ftparchive program - ifdef BDBLIB - PROGRAM=apt-ftparchive --SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) -+SLIBS = -lapt-pkg -lapt-inst -lpub $(BDBLIB) - LIB_MAKES = apt-pkg/makefile apt-inst/makefile - SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \ - multicompress.cc diff --git a/sysutils/apt/files/patch-methods_gpgv.cc b/sysutils/apt/files/patch-methods_gpgv.cc deleted file mode 100644 index 11532d927474..000000000000 --- a/sysutils/apt/files/patch-methods_gpgv.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- methods/gpgv.cc.orig Tue Jul 25 04:19:02 2006 -+++ methods/gpgv.cc Tue Nov 14 21:18:00 2006 -@@ -52,8 +52,8 @@ - FILE *pipein; - int status; - struct stat buff; -- string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); -- string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); -+ string gpgvpath = _config->Find("Dir::Bin::gpg", "@LOCALBASE@/bin/gpgv"); -+ string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "@PREFIX@/etc/apt/trusted.gpg"); - if (_config->FindB("Debug::Acquire::gpgv", false)) - { - std::cerr << "gpgv path: " << gpgvpath << std::endl; diff --git a/sysutils/apt/files/patch-methods_makefile b/sysutils/apt/files/patch-methods_makefile deleted file mode 100644 index 1252a7d98e06..000000000000 --- a/sysutils/apt/files/patch-methods_makefile +++ /dev/null @@ -1,82 +0,0 @@ ---- methods/makefile.orig Mon Dec 4 06:37:36 2006 -+++ methods/makefile Thu Mar 13 17:54:25 2008 -@@ -12,63 +12,70 @@ - - # The file method - PROGRAM=file --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = file.cc - include $(PROGRAM_H) - - # The copy method - PROGRAM=copy --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = copy.cc - include $(PROGRAM_H) - - # The gzip method - PROGRAM=gzip --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = gzip.cc - include $(PROGRAM_H) - - # The gpgv method - PROGRAM=gpgv --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = gpgv.cc - include $(PROGRAM_H) - - # The cdrom method - PROGRAM=cdrom --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = cdrom.cc - include $(PROGRAM_H) - - # The http method - PROGRAM=http --SLIBS = -lapt-pkg $(SOCKETLIBS) -+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = http.cc rfc2553emu.cc connect.cc - include $(PROGRAM_H) - -+# The https method -+PROGRAM=https -+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lcurl -+LIB_MAKES = apt-pkg/makefile -+SOURCE = https.cc -+include $(PROGRAM_H) -+ - # The ftp method - PROGRAM=ftp --SLIBS = -lapt-pkg $(SOCKETLIBS) -+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = ftp.cc rfc2553emu.cc connect.cc - include $(PROGRAM_H) - - # The rred method - PROGRAM=rred --SLIBS = -lapt-pkg $(SOCKETLIBS) -+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = rred.cc - include $(PROGRAM_H) - - # The rsh method - PROGRAM=rsh --SLIBS = -lapt-pkg -+SLIBS = -lapt-pkg $(INTLLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = rsh.cc - include $(PROGRAM_H) diff --git a/sysutils/apt/pkg-descr b/sysutils/apt/pkg-descr deleted file mode 100644 index 2365974fe79e..000000000000 --- a/sysutils/apt/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -APT is the Debian project's advanced front-end for dpkg. APT features complete -installation ordering, multiple source capability and several other unique -features. - -WWW: http://packages.debian.org/apt diff --git a/sysutils/apt/pkg-plist b/sysutils/apt/pkg-plist deleted file mode 100644 index 55f834e7750c..000000000000 --- a/sysutils/apt/pkg-plist +++ /dev/null @@ -1,120 +0,0 @@ -bin/apt-cache -bin/apt-cdrom -bin/apt-config -bin/apt-extracttemplates -bin/apt-get -bin/apt-sortpkgs -bin/apt-key -bin/apt-ftparchive -lib/libapt-inst.so -lib/libapt-inst.so.1.1 -lib/libapt-inst.so.1.1.0 -lib/libapt-pkg.so -lib/libapt-pkg.so.3.11 -lib/libapt-pkg.so.3.11.0 -@dir share/apt/keyrings -libexec/apt/methods/cdrom -libexec/apt/methods/copy -libexec/apt/methods/file -libexec/apt/methods/ftp -libexec/apt/methods/gpgv -libexec/apt/methods/gzip -libexec/apt/methods/http -libexec/apt/methods/https -libexec/apt/methods/rred -libexec/apt/methods/rsh -libexec/apt/methods/ssh -libexec/apt/methods/bzip2 -libexec/dpkg/methods/apt/desc.apt -libexec/dpkg/methods/apt/names -libexec/dpkg/methods/apt/install -libexec/dpkg/methods/apt/setup -libexec/dpkg/methods/apt/update -include/apt-pkg/mmap.h -include/apt-pkg/error.h -include/apt-pkg/configuration.h -include/apt-pkg/fileutl.h -include/apt-pkg/cmndline.h -include/apt-pkg/md5.h -include/apt-pkg/crc-16.h -include/apt-pkg/cdromutl.h -include/apt-pkg/strutl.h -include/apt-pkg/sptr.h -include/apt-pkg/sha1.h -include/apt-pkg/sha256.h -include/apt-pkg/hashes.h -include/apt-pkg/algorithms.h -include/apt-pkg/depcache.h -include/apt-pkg/pkgcachegen.h -include/apt-pkg/cacheiterators.h -include/apt-pkg/orderlist.h -include/apt-pkg/sourcelist.h -include/apt-pkg/packagemanager.h -include/apt-pkg/tagfile.h -include/apt-pkg/init.h -include/apt-pkg/pkgcache.h -include/apt-pkg/version.h -include/apt-pkg/progress.h -include/apt-pkg/pkgrecords.h -include/apt-pkg/acquire.h -include/apt-pkg/acquire-worker.h -include/apt-pkg/acquire-item.h -include/apt-pkg/acquire-method.h -include/apt-pkg/clean.h -include/apt-pkg/srcrecords.h -include/apt-pkg/cachefile.h -include/apt-pkg/versionmatch.h -include/apt-pkg/policy.h -include/apt-pkg/pkgsystem.h -include/apt-pkg/indexfile.h -include/apt-pkg/metaindex.h -include/apt-pkg/indexrecords.h -include/apt-pkg/vendor.h -include/apt-pkg/vendorlist.h -include/apt-pkg/cdrom.h -include/apt-pkg/indexcopy.h -include/apt-pkg/debversion.h -include/apt-pkg/debsrcrecords.h -include/apt-pkg/dpkgpm.h -include/apt-pkg/debrecords.h -include/apt-pkg/deblistparser.h -include/apt-pkg/debsystem.h -include/apt-pkg/debindexfile.h -include/apt-pkg/debmetaindex.h -include/apt-pkg/extracttar.h -include/apt-pkg/arfile.h -include/apt-pkg/filelist.h -include/apt-pkg/database.h -include/apt-pkg/extract.h -include/apt-pkg/dpkgdb.h -include/apt-pkg/dirstream.h -include/apt-pkg/debfile.h -man/man1/apt-extracttemplates.1.gz -man/man1/apt-ftparchive.1.gz -man/man1/apt-sortpkgs.1.gz -man/man5/apt.conf.5.gz -man/man5/apt_preferences.5.gz -man/man5/sources.list.5.gz -man/man8/apt-cache.8.gz -man/man8/apt-cdrom.8.gz -man/man8/apt-config.8.gz -man/man8/apt-get.8.gz -man/man8/apt-key.8.gz -man/man8/apt-secure.8.gz -@dir etc/apt/conf.d -@sample etc/apt/sources.list.sample -@sample etc/apt/apt.conf.sample -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL -%%PORTDOCS%%%%DOCSDIR%%/README.progress-reporting -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apt.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sources.list -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configure-index -@dir /%%APTDIR%%/cache/archives/partial -@dir /%%APTDIR%%/cache/archives -@dir /%%APTDIR%%/cache -@dir /%%APTDIR%%/state/lists/partial -@dir /%%APTDIR%%/state/lists -@dir /%%APTDIR%%/state -@dir /%%APTDIR%% diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile index 5706acd5b212..bc8739670de5 100644 --- a/x11-drivers/Makefile +++ b/x11-drivers/Makefile @@ -3,7 +3,6 @@ COMMENT = X11 drivers - SUBDIR += drm-kmod SUBDIR += xf86-input-acecad SUBDIR += xf86-input-egalax SUBDIR += xf86-input-elographics diff --git a/x11-drivers/drm-kmod/Makefile b/x11-drivers/drm-kmod/Makefile deleted file mode 100644 index 47f36813a3e9..000000000000 --- a/x11-drivers/drm-kmod/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Jean-Sebastien Pedron <dumbbell@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= drm-kmod -DISTVERSION= 9.280208 -CATEGORIES= x11-drivers -MASTER_SITES= LOCAL/dumbbell -DISTNAME= drm-${DISTVERSION} - -MAINTAINER= x11@FreeBSD.org -COMMENT= FreeBSD 9.3 Kernel DRM driver - -LICENSE= MIT - -IGNORE= this port is only for 9.3 systems -DEPRECATED= ${IGNORE} -EXPIRATION_DATE= 2017-01-15 - -USES= kmod uidfix tar:xz -ONLY_FOR_ARCHS= i386 amd64 - -PLIST_FILES= ${KMODDIR}/drm2_port.ko \ - ${KMODDIR}/i915kms_port.ko \ - ${KMODDIR}/radeonkms_port.ko \ - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+=" HAVE_DEBUG=YES" -.endif - -.include <bsd.port.mk> diff --git a/x11-drivers/drm-kmod/distinfo b/x11-drivers/drm-kmod/distinfo deleted file mode 100644 index 1607aec41cfa..000000000000 --- a/x11-drivers/drm-kmod/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (drm-9.280208.tar.xz) = 27586b92a14b4a7596e838eaeb596ae82b53cb7807179a456bb4e5cad0c8c8b0 -SIZE (drm-9.280208.tar.xz) = 902972 diff --git a/x11-drivers/drm-kmod/pkg-descr b/x11-drivers/drm-kmod/pkg-descr deleted file mode 100644 index 31ac0d6b159a..000000000000 --- a/x11-drivers/drm-kmod/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -The DRM kernel driver supports Intel and Radeon GPUs. - -WWW: http://www.freebsd.org/ |