diff options
135 files changed, 16 insertions, 12073 deletions
@@ -182,7 +182,6 @@ serious.sam* games/linux-ssamtfe Redistribution limited serious.sam* games/linux-ssamtse Redistribution limited sharefonts-* x11-fonts/sharefonts Shareware: cannot be distributed without prior authorization shorten-* audio/shorten May not be sold. May not be distributed if modified -shoutcast audio/shoutcast Personal use only. See tos.txt in this port for full details sid-milter-* mail/sid-milter May incorporate intellectual property, possible patent issues simian-* devel/simian Have to agree to license before download skype* net-im/skype Redistribution prohibited @@ -11112,3 +11112,19 @@ graphics/kipi-plugin-imgurexport||2018-12-31|Removed, part of expired KDE4 graphics/kipi-plugin-printimages||2018-12-31|Removed, part of expired KDE4 graphics/digikam-kde4-doc||2018-12-31|Removed, part of expired KDE4 graphics/digikam-kde4-l10n||2018-12-31|Has expired: KDE4 is EOL upstream +net/libsrtp|net/libsrtp2|2018-12-31|Has expired: Superseded by libsrtp2 +x11-toolkits/wlc||2018-12-31|Has expired: Deprecated upstream +japanese/spamassassin|mail/spamassassin|2018-12-31|Has expired: does not build +www/spdylay||2018-12-31|Has expired: SPDY is deprecated, use HTTP/2 instead +www/moodle33|www/moodle35|2018-12-31|Has expired: Upstream no longer maintained +security/krb5-114|security/krb5|2018-12-31|Has expired: EOL twelve months after release of krb5-1.16 +databases/mongodb32|databases/mongodb34|2018-12-31|Has expired: EOL upstream since September 2018 +databases/mongodb32-tools|databases/mongodb34-tools|2018-12-31|Has expired: EOL upstream since September 2018 +audio/creox||2018-12-31|Has expired: Qt4 has been EOL since december 2015 +audio/terminatorx||2018-12-31|Has expired: Unmaintained, broken too often +audio/shoutcast||2018-12-31|Has expired: Upstream vendor no longer provides releases +dns/powerdns-recursor40|dns/powerdns-recursor|2018-12-31|Has expired: FreeBSD 10.3 has reached EoL since 2018-04-30; users should upgrade and use dns/powerdns-recursor instead +sysutils/ataidle||2018-12-31|Has expired: obsoleted by camcontrol(8) +sysutils/syslog-ng37|sysutils/syslog-ng|2018-12-31|Has expired: No longer officially supported by Balabit, does not support openssl111 +sysutils/cfengine22|sysutils/cfengine|2018-12-31|Has expired: No longeer supported by cfengine.com +sysutils/syslog-ng36|sysutils/syslog-ng|2018-12-31|Has expired: No longer officially supported by Balabit, does not support openssl111 diff --git a/audio/Makefile b/audio/Makefile index b92c6c32f0ae..9918816ac898 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -91,7 +91,6 @@ SUBDIR += cpige SUBDIR += cplay SUBDIR += cpp-xmms2 - SUBDIR += creox SUBDIR += crip SUBDIR += csound SUBDIR += csoundqt @@ -765,7 +764,6 @@ SUBDIR += shorten SUBDIR += shout SUBDIR += shout-idjc - SUBDIR += shoutcast SUBDIR += sidplay SUBDIR += sidplay2 SUBDIR += sidplayer @@ -826,7 +824,6 @@ SUBDIR += tcd SUBDIR += teamspeak3-server SUBDIR += tempest_for_eliza - SUBDIR += terminatorx SUBDIR += thunar-media-tags-plugin SUBDIR += timemachine SUBDIR += timidity diff --git a/audio/creox/Makefile b/audio/creox/Makefile deleted file mode 100644 index 135ce82916ff..000000000000 --- a/audio/creox/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= creox -PORTVERSION= 0.3 -PORTREVISION= 6 -CATEGORIES= audio kde - -MAINTAINER= ports@FreeBSD.org -COMMENT= Realtime sound processor - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2018-12-31 - -LIB_DEPENDS= libjack.so:audio/jack - -USE_GITHUB= yes -GH_ACCOUNT= laudrup -GH_PROJECT= Creox4 - -USES= cmake kde:4 qt:4 -USE_KDE= automoc4 kdelibs -USE_QT= moc_build qmake_build rcc_build uic_build -USE_XORG= xft xpm -USE_CXXSTD= gnu++98 - -post-patch: - @${REINPLACE_CMD} -e \ - '/-Wno-unused-but-set-variable/d' ${WRKSRC}/CMakeLists.txt -# FreeBSD does not have exp10f(3), use powf(3) instead - @${GREP} -lR "exp10f(" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's|exp10f(|powf(10.,|' - -.include <bsd.port.mk> diff --git a/audio/creox/distinfo b/audio/creox/distinfo deleted file mode 100644 index fe8fdfb4fd22..000000000000 --- a/audio/creox/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (laudrup-Creox4-0.3_GH0.tar.gz) = c8de084acb219bd5ac40b4802ab1a2d876af8ab9e31d183df82ee4652cbd2c88 -SIZE (laudrup-Creox4-0.3_GH0.tar.gz) = 216273 diff --git a/audio/creox/files/patch-creox_effects__dsp_distortionprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_distortionprocessor.cpp deleted file mode 100644 index 2361e4233b47..000000000000 --- a/audio/creox/files/patch-creox_effects__dsp_distortionprocessor.cpp +++ /dev/null @@ -1,32 +0,0 @@ ---- creox/effects_dsp/distortionprocessor.cpp.orig 2011-06-21 21:27:40 UTC -+++ creox/effects_dsp/distortionprocessor.cpp -@@ -424,7 +424,8 @@ void DistortionProcessor::computeBPFCoef - { - const float omega = 2.0f*float(M_PI)*centerFrequency/m_samplerate_f; - float sn,cs; -- sincosf(omega, &sn, &cs); -+ sn = sinf(omega); -+ cs = cosf(omega); - const float alpha = sn*sinhf(float(M_LN2/2.0)*bandwidth*(omega/sn)); - const float a0 = 1.0f/(1.0f + alpha); //a0 = 1/a0 - -@@ -463,7 +464,8 @@ void DistortionProcessor::computeLowShel - const float A = exp10f(gain/40.0f); - const float omega = 2.0f*float(M_PI)*frequency/m_samplerate_f; - float sn,cs; -- sincosf(omega, &sn, &cs); -+ sn = sinf(omega); -+ cs = cosf(omega); - register const float beta = sn * sqrtf( (A*A + 1.0f)/slope - powf(A-1.0f, 2.0f) ); - - register const float AplusOne = A + 1.0f; -@@ -501,7 +503,8 @@ void DistortionProcessor::computeLowPass - { - const float omega = 2.0f*float(M_PI)*cutoffFrequency/m_samplerate_f; - float sn,cs; -- sincosf(omega, &sn, &cs); -+ sn = sinf(omega); -+ cs = cosf(omega); - const float alpha = sn/(2.0f * Q); - const float a0 = 1.0f/(1.0f + alpha); //a0 = 1/a0 - diff --git a/audio/creox/files/patch-creox_effects__dsp_echoprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_echoprocessor.cpp deleted file mode 100644 index a012ba414873..000000000000 --- a/audio/creox/files/patch-creox_effects__dsp_echoprocessor.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- creox/effects_dsp/echoprocessor.cpp.orig 2011-06-21 21:27:40 UTC -+++ creox/effects_dsp/echoprocessor.cpp -@@ -221,7 +221,7 @@ void EchoProcessor::signalFlow_run(const - parallelEchoes += parEcho * m_parallelEchoParam[count].decay_f; - #ifdef FP_FAST_FMAF - *(m_parallelEchoChain[count].buffer + m_parallelEchoChain[count].offset) = -- std::fmaf(parEcho, m_parallelEchoParam[count].feedback_f, inputSample); -+ fmaf(parEcho, m_parallelEchoParam[count].feedback_f, inputSample); - #else - *(m_parallelEchoChain[count].buffer + m_parallelEchoChain[count].offset) = - inputSample + (parEcho * m_parallelEchoParam[count].feedback_f); diff --git a/audio/creox/files/patch-creox_effects__dsp_phaserprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_phaserprocessor.cpp deleted file mode 100644 index 6a4940906f99..000000000000 --- a/audio/creox/files/patch-creox_effects__dsp_phaserprocessor.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- creox/effects_dsp/phaserprocessor.cpp.orig 2011-06-21 21:27:40 UTC -+++ creox/effects_dsp/phaserprocessor.cpp -@@ -157,7 +157,8 @@ void PhaserProcessor::signalFlow_run(con - { - const float omega = 2.0f * float(M_PI) * m_stepFrequency / m_samplerate_d; - float sn, cs; -- sincosf(omega, &sn, &cs); -+ sn = sinf(omega); -+ cs = cosf(omega); - *(m_coefBuffPrelim++) = cs; // cs - *(m_coefBuffPrelim++) = sn / m_resonance; // alpha (m_resonance = 2.0*resonance) - m_stepFrequency *= m_expStep; -@@ -232,7 +233,8 @@ void PhaserProcessor::signalFlow_run(con - } - - float sn, cs; -- sincosf(omega, &sn, &cs); -+ sn = sinf(omega); -+ cs = cosf(omega); - register const float alpha = sn / m_resonance; // alpha (m_resonance = 2.0 * resonance) - - // perform filter diff --git a/audio/creox/files/patch-creox_effects__dsp_tremoloprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_tremoloprocessor.cpp deleted file mode 100644 index 966768bb3463..000000000000 --- a/audio/creox/files/patch-creox_effects__dsp_tremoloprocessor.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- creox/effects_dsp/tremoloprocessor.cpp.orig 2011-06-21 21:27:40 UTC -+++ creox/effects_dsp/tremoloprocessor.cpp -@@ -182,8 +182,8 @@ void TremoloProcessor::signalFlow_run(co - register const float inputSample = *(inputBuffer++) * m_inputGain_f; - #ifdef FP_FAST_FMAF - *(outputBuffer++) = (inputSample * m_dry_f) -- + (inputSample * m_wet_f * std::fmaf(amplitudeModulation, -- m_modulationMulti, m_modulationShift); -+ + (inputSample * m_wet_f * fmaf(amplitudeModulation, -+ m_modulationMulti, m_modulationShift)); - #else - *(outputBuffer++) = (inputSample * m_dry_f) - + (inputSample * m_wet_f * ((amplitudeModulation * m_modulationMulti) diff --git a/audio/creox/pkg-descr b/audio/creox/pkg-descr deleted file mode 100644 index 31200974bf63..000000000000 --- a/audio/creox/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Creox is a real-time sound processor. You can plug your electric guitar -or any other musical instrument directly to the PC's sound card and -start experimenting with various sound effects. Creox offers nice -user-friendly KDE-based GUI, a preset support, a low-latency DSP engine, -and each effect parameter can be altered "on the fly". - -As Creox is a JACK application, the output sound can be routed to the -other JACK-aware applications, and the audio input can be taken as the -output from the other JACK client. - -WWW: https://stacktrace.dk/project/creox-4/ diff --git a/audio/creox/pkg-plist b/audio/creox/pkg-plist deleted file mode 100644 index 264e9f6ace0b..000000000000 --- a/audio/creox/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/creox -share/applications/kde4/creox.desktop -share/apps/creox/creoxui.rc -share/apps/creox/pics/crsplash.png -share/config.kcfg/creox4.kcfg -share/icons/hicolor/16x16/apps/creox.png -share/icons/hicolor/32x32/apps/creox.png -share/icons/hicolor/48x48/apps/creox.png -share/icons/hicolor/64x64/apps/creox.png diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile deleted file mode 100644 index 677d4cc1e8e9..000000000000 --- a/audio/shoutcast/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# Created by: Jarrod Sayers <jarrod@downtools.com.au> -# $FreeBSD$ - -PORTNAME= shoutcast -PORTVERSION= 2.4.7.256 -PORTREVISION= 2 -CATEGORIES= audio net -MASTER_SITES= http://download.nullsoft.com/shoutcast/tools/ \ - http://people.freebsd.org/~sbruno/shoutcast/distfiles/ -DISTNAME= sc_serv2_bsd-latest - -MAINTAINER= sbruno@FreeBSD.org -COMMENT= SHOUTcast Distributed Network Audio Server - -RESTRICTED= redistribution of software is not permitted -DEPRECATED= Upstream vendor no longer provides releases -EXPIRATION_DATE=2018-12-31 -IA32_BINARY_PORT= yes - -USES= dos2unix shebangfix -DOS2UNIX_REGEX= .*\.(conf|css|html|js|txt|xml) -bash_CMD= ${SH} -SHEBANG_FILES= setup.sh - -USE_RC_SUBR= shoutcast - -CONFLICTS= linux-shoutcast-[0-9]* -NO_WRKSUBDIR= yes -NO_BUILD= yes - -OPTIONS_DEFINE= SERVERSETUP DOCS EXAMPLES -OPTIONS_DEFAULT= SERVERSETUP -SERVERSETUP_DESC= SHOUTcast Server Setup Tools -EXAMPLE_DESC= SHOUTcast Server Example Configuration Files - -DATADIR= ${WWWDIR} -SHOUTCASTLDIR= /var/log/${PORTNAME} -SHOUTCASTDIR= /var/run/${PORTNAME} - -SHOUTCASTUSER= ${PORTNAME} -SHOUTCASTGROUP= ${PORTNAME} -USERS= ${SHOUTCASTUSER} -GROUPS= ${SHOUTCASTGROUP} - -SUB_FILES= pkg-message -SUB_LIST= SHOUTCASTUSER=${SHOUTCASTUSER} SHOUTCASTDIR=${SHOUTCASTDIR} - -PORTDATA= * -PORTDOCS= docs *.html *.pem *.txt -PORTEXAMPLES= *.conf - -PLIST_DIRS= ${ETCDIR} ${SHOUTCASTLDIR} ${SHOUTCASTDIR} \ - ${SHOUTCASTDIR}/control ${SHOUTCASTDIR}/logs -PLIST_FILES= sbin/sc_serv -.for ext in ban rip -PLIST_FILES+= "@postunexec if [ ! -s ${SHOUTCASTDIR}/sc_serv.${ext} ];\ - then ${RM} ${SHOUTCASTDIR}/sc_serv.${ext}; fi" -.endfor - -.include <bsd.port.options.mk> - -.if ${ARCH} == "i386" -RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x -.else -RUN_DEPENDS+= ${LOCALBASE}/lib32/compat/libstdc++.so.6:misc/compat9x -.endif - -post-patch: - @${REINPLACE_CMD} -e '/sc_serv2 directory/d' \ - -e 's#=.*/\([^\.]*.log\)#=${SHOUTCASTLDIR}/\1#g' \ - -e 's#=control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/examples/sc_serv_*.conf - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${STAGEDIR}${PREFIX}/sbin - @${MKDIR} ${STAGEDIR}${ETCDIR} - @${MKDIR} ${STAGEDIR}${SHOUTCASTLDIR} - @${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/control - @${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/logs - -do-install-DOCS-on: - (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) - -do-install-EXAMPLES-on: - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \ - ${STAGEDIR}${EXAMPLESDIR}) - -do-install-SERVERSETUP-on: - (cd ${WRKSRC} && ${COPYTREE_SHARE} "setup setup.sh" ${STAGEDIR}${DATADIR}) - -.include <bsd.port.mk> diff --git a/audio/shoutcast/distinfo b/audio/shoutcast/distinfo deleted file mode 100644 index 1fbfd58fed5d..000000000000 --- a/audio/shoutcast/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (sc_serv2_bsd-latest.tar.gz) = 9a4bf61b7cf88df2545f068d891b92f1778c5c2c4b71b2123ed729405b07e08e -SIZE (sc_serv2_bsd-latest.tar.gz) = 3382677 diff --git a/audio/shoutcast/files/pkg-message.in b/audio/shoutcast/files/pkg-message.in deleted file mode 100644 index 950c76b4e4fb..000000000000 --- a/audio/shoutcast/files/pkg-message.in +++ /dev/null @@ -1,13 +0,0 @@ -********************************************************************** - - SHOUTcast Distributed Network Audio Server is now installed. - - Enable SHOUTcast in /etc/rc.conf with the following line: - - shoutcast_enable="YES" - - See %%EXAMPLESDIR%% for configuration examples. - A basic installation can be completed by copying sc_serv_basic.conf - to %%ETCDIR%%/sc_serv.conf. - -********************************************************************** diff --git a/audio/shoutcast/files/shoutcast.in b/audio/shoutcast/files/shoutcast.in deleted file mode 100644 index c9d5aa2d657b..000000000000 --- a/audio/shoutcast/files/shoutcast.in +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: shoutcast -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable SHOUTcast: -# shoutcast_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable SHOUTcast. -# shoutcast_configfile (str): Set to "%%ETCDIR%%/sc_serv.conf" by default. -# shoutcast_user (str): Set to "%%SHOUTCASTUSER%%" by default. -# shoutcast_chdir (str): Set to "%%SHOUTCASTDIR%%" by default. - -. /etc/rc.subr - -name=shoutcast -rcvar=shoutcast_enable - -load_rc_config ${name} - -: ${shoutcast_enable:="NO"} -: ${shoutcast_configfile:="%%ETCDIR%%/sc_serv.conf"} -: ${shoutcast_user:="%%SHOUTCASTUSER%%"} -: ${shoutcast_chdir:="%%SHOUTCASTDIR%%"} - -command="%%PREFIX%%/sbin/sc_serv" - -required_dirs="${shoutcast_chdir}" -required_files="${shoutcast_configfile}" - -command_args="${shoutcast_configfile} >/dev/null 2>&1 &" - -run_rc_command "$1" diff --git a/audio/shoutcast/pkg-descr b/audio/shoutcast/pkg-descr deleted file mode 100644 index 04419babf301..000000000000 --- a/audio/shoutcast/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -SHOUTcast Distributed Network Audio Server 2.0 (or DNAS for short) is -the next-generation SHOUTcast server technology, designed to work with -the new YP 2.0 playform that supports real-time and coming soon search -results, international chatacter encoding support, and much more! - -WWW: http://www.shoutcast.com/broadcast-tools/ diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile deleted file mode 100644 index 9f74b7e975ee..000000000000 --- a/audio/terminatorx/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -# Created by: Tilman Linneweh <arved@FreeBSD.org> -# $FreeBSD$ -# $MCom: ports/audio/terminatorx/Makefile,v 1.6 2007/08/04 03:51:28 marcus Exp $ - -PORTNAME= terminatorx -PORTVERSION= 4.0.1 -CATEGORIES= audio -MASTER_SITES= http://terminatorx.org/dist/ -DISTNAME= terminatorX-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Realtime audio synthesizer that allows you to "scratch" on audio data - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN= fails configure: checking gnome-doc-utils >= 0.3.2... no -BROKEN_powerpc64=fails to configure: checking for XOpenDisplay in -lX11... no -DEPRECATED= Unmaintained, broken too often -EXPIRATION_DATE= 2018-12-31 - -BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \ - rarian-sk-config:textproc/rarian -LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \ - liblrdf.so:textproc/liblrdf \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 - -USES= tar:bzip2 gmake gnome pathfix pkgconfig -USE_GNOME= cairo gdkpixbuf2 gtk30 libxml2 -USE_XORG= x11 xext xi xxf86dga ice sm - -OPTIONS_DEFINE= ALSA JACK MPG123 SOX VORBIS MAD -OPTIONS_DEFAULT= JACK MPG123 SOX VORBIS MAD -SOX_DESC= sox (.au) support -MPG123_DESC= mpg123 support - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-alsamidi \ - --disable-scheduler -INSTALLS_OMF= yes - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CONFIGURE_OFF= --disable-alsa -JACK_LIB_DEPENDS= libjack.so:audio/jack -JACK_CONFIGURE_OFF= --disable-jack -MPG123_BUILD_DEPENDS= mpg123:audio/mpg123 -MPG123_RUN_DEPENDS= mpg123:audio/mpg123 -MPG123_CONFIGURE_OFF= --disable-mpg123 -SOX_BUILD_DEPENDS= sox:audio/sox -SOX_RUN_DEPENDS= sox:audio/sox -SOX_CONFIGURE_OFF= --disable-sox -VORBIS_BUILD_DEPENDS= oggenc:audio/vorbis-tools -VORBIS_RUN_DEPENDS= oggenc:audio/vorbis-tools -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis -VORBIS_CONFIGURE_OFF= --disable-vorbis -MAD_LIB_DEPENDS= libmad.so:audio/libmad -MAD_CONFIGURE_OFF= --disable-mad - -INSTALL_ICONS= yes - -pre-configure: - cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh - -post-patch: - @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's|malloc\.h|stdlib.h|g' - @${GREP} -lR "%%LOCALBASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's|%%LOCALBASE%%|${LOCALBASE}|g' - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/terminatorX ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/terminatorX.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.for file in *.png - ${INSTALL_DATA} ${WRKSRC}/icons/${file} \ - ${STAGEDIR}${PREFIX}/share/pixmaps -.endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/share/mime-info -.for f in terminatorX.mime terminatorX.keys - ${INSTALL_DATA} ${WRKSRC}/${f} \ - ${STAGEDIR}${PREFIX}/share/mime-info -.endfor - ${INSTALL_DATA} ${WRKSRC}/terminatorX.desktop \ - ${STAGEDIR}${PREFIX}/share/applications - @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C - ${INSTALL_DATA} ${WRKSRC}/help/C/terminatorX-manual.xml \ - ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C/terminatorX.xml - @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C/figures - ${INSTALL_DATA} ${WRKSRC}/help/C/figures/signalflow.png \ - ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C/figures - @${MKDIR} ${STAGEDIR}${PREFIX}/share/omf/terminatorX - ${INSTALL_DATA} ${WRKSRC}/help/terminatorX-manual-C.omf \ - ${STAGEDIR}${PREFIX}/share/omf/terminatorX/terminatorX-C.omf - -.include <bsd.port.mk> diff --git a/audio/terminatorx/distinfo b/audio/terminatorx/distinfo deleted file mode 100644 index cb5c0f48d809..000000000000 --- a/audio/terminatorx/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1541608090 -SHA256 (terminatorX-4.0.1.tar.bz2) = 96e2e7910d96b9bdadb315727c4127cfda579bd68d2b25d99cd9d35e9fbea56a -SIZE (terminatorX-4.0.1.tar.bz2) = 1832692 diff --git a/audio/terminatorx/files/patch-aclocal.m4 b/audio/terminatorx/files/patch-aclocal.m4 deleted file mode 100644 index 0b1753023536..000000000000 --- a/audio/terminatorx/files/patch-aclocal.m4 +++ /dev/null @@ -1,30 +0,0 @@ ---- aclocal.m4.orig 2018-11-07 18:55:24 UTC -+++ aclocal.m4 -@@ -1,4 +1,4 @@ --# generated automatically by aclocal 1.15 -*- Autoconf -*- -+# generated automatically by aclocal 1.16 -*- Autoconf -*- - - # Copyright (C) 1996-2014 Free Software Foundation, Inc. - -@@ -588,10 +588,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl - # generated from the m4 files accompanying Automake X.Y. - # (This private macro should not be called outside this file.) - AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.15' -+[am__api_version='1.16' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.15], [], -+m4_if([$1], [1.16], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -607,7 +607,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.15])dnl -+[AM_AUTOMAKE_VERSION([1.16])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/audio/terminatorx/files/patch-configure b/audio/terminatorx/files/patch-configure deleted file mode 100644 index 2f9ce7dc947d..000000000000 --- a/audio/terminatorx/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2018-11-07 18:59:29 UTC -+++ configure -@@ -2287,7 +2287,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --am__api_version='1.15' -+am__api_version='1.16' - - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -@@ -5580,7 +5580,7 @@ fi - done - - --for ac_header in fcntl.h limits.h malloc.h unistd.h -+for ac_header in fcntl.h limits.h stdlib.h unistd.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/audio/terminatorx/files/patch-configure.ac b/audio/terminatorx/files/patch-configure.ac deleted file mode 100644 index e46c4869472a..000000000000 --- a/audio/terminatorx/files/patch-configure.ac +++ /dev/null @@ -1,36 +0,0 @@ ---- configure.ac.orig 2018-11-07 18:12:55 UTC -+++ configure.ac -@@ -122,6 +122,33 @@ if test "$tX_threads" = "no"; then - AC_MSG_ERROR([** failed to detect pthreads implementation **]) - fi - -+AC_CHECK_FUNC(scandir, -+ if test "x$uname" = xSunOS -o "x$uname" = xQNX; then -+ AC_MSG_WARN(Not using $uname scandir emulation function.) -+ else -+ AC_DEFINE(HAVE_SCANDIR, 1, [Has scandir]) -+ fi) -+ -+dnl Do we have the POSIX compatible scandir() prototype? -+AC_CACHE_CHECK([whether we have the POSIX compatible scandir() prototype], -+ ac_cv_cxx_scandir_posix,[ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ AC_TRY_COMPILE([ -+ #include <dirent.h> -+ int func (const char *d, dirent ***list, void *sort) { -+ int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); -+ } -+ ],[ -+ ], ac_cv_cxx_scandir_posix=yes, ac_cv_cxx_scandir_posix=no) -+ AC_LANG_RESTORE -+ ]) -+ -+if test "$ac_cv_cxx_scandir_posix" = yes; then -+ AC_DEFINE(HAVE_SCANDIR_POSIX, 1, [scandir conforms to POSIX]) -+fi -+ -+ - - AC_SEARCH_LIBS([dlclose], [dl]) - diff --git a/audio/terminatorx/files/patch-src_main.cc b/audio/terminatorx/files/patch-src_main.cc deleted file mode 100644 index f5461e893806..000000000000 --- a/audio/terminatorx/files/patch-src_main.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.cc.orig 2011-01-30 21:01:30 UTC -+++ src/main.cc -@@ -33,7 +33,7 @@ - 4 October 1999: Rewrite ;) - back to C++ - */ - --#define TX_GTKRC "/usr/share/themes/terminatorX/gtk/gtkrc" -+#define TX_GTKRC "%%LOCALBASE%%/share/themes/terminatorX/gtk/gtkrc" - - #define BENCH_CYCLES 100000 - diff --git a/audio/terminatorx/files/patch-src_tX__audiodevice.cc b/audio/terminatorx/files/patch-src_tX__audiodevice.cc deleted file mode 100644 index 7cd49cce98c6..000000000000 --- a/audio/terminatorx/files/patch-src_tX__audiodevice.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tX_audiodevice.cc.orig 2018-11-07 17:14:34 UTC -+++ src/tX_audiodevice.cc -@@ -594,7 +594,7 @@ tX_jack_client tX_jack_client::instance; - bool tX_jack_client::init() - { - if (!client_initialized) { -- if ((client=jack_client_open("terminatorX", (jack_options_t) NULL, NULL))==0) { -+ if ((client=jack_client_open("terminatorX", (jack_options_t) '\0', NULL))==0) { - tX_error("tX_jack_client() -> failed to connect to jackd."); - } else { - client_initialized = true; diff --git a/audio/terminatorx/files/patch-src_tX__dialog.cc b/audio/terminatorx/files/patch-src_tX__dialog.cc deleted file mode 100644 index 1d5effccafd5..000000000000 --- a/audio/terminatorx/files/patch-src_tX__dialog.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/tX_dialog.cc.orig 2018-11-07 19:20:20 UTC -+++ src/tX_dialog.cc -@@ -244,13 +244,18 @@ void append_alsa_device_list(GtkComboBox - } - } - #else --void append_alsa_device_list(GtkComboBoxText *combo) { -+void append_alsa_device_list(GtkComboBoxText *combo,char *current) { - } - #endif - - - #ifdef USE_OSS -+#ifdef HAVE_SCANDIR_POSIX - int oss_select_dsp_only(const struct dirent *entry){ -+#else -+int oss_select_dsp_only(struct dirent *entry){ -+#endif -+ - return (strstr(entry->d_name, "dsp")!=0); - } - diff --git a/audio/terminatorx/files/patch-src_tX__global.c b/audio/terminatorx/files/patch-src_tX__global.c deleted file mode 100644 index 696d672b82be..000000000000 --- a/audio/terminatorx/files/patch-src_tX__global.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/tX_global.c.orig 2018-11-07 17:27:45 UTC -+++ src/tX_global.c -@@ -129,6 +129,7 @@ void set_global_defaults() { - globals.use_stdout_cmdline=0; - strcpy(globals.current_path, ""); - strcpy(globals.lrdf_path, "/usr/share/ladspa/rdf:/usr/local/share/ladspa/rdf"); -+ strcpy(globals.lrdf_path, "%%LOCALBASE%%/share/ladspa/rdf"); - globals.fullscreen_enabled=0; - globals.confirm_events=0; - globals.compress_set_files=0; diff --git a/audio/terminatorx/files/patch-src_tX__ladspa.cc b/audio/terminatorx/files/patch-src_tX__ladspa.cc deleted file mode 100644 index a7e9dc7ef5fe..000000000000 --- a/audio/terminatorx/files/patch-src_tX__ladspa.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/tX_ladspa.cc.orig 2011-01-30 21:01:31 UTC -+++ src/tX_ladspa.cc -@@ -45,8 +45,8 @@ void LADSPA_Plugin :: init () - ladspa_path_ptr=getenv("LADSPA_PATH"); - - if (!ladspa_path_ptr) { -- tX_warning("LADSPA_PATH not set. Trying /usr/lib/ladspa:/usr/local/lib/ladspa"); -- strcpy(ladspa_path, "/usr/lib/ladspa:/usr/local/lib/ladspa"); -+ tX_warning("LADSPA_PATH not set. Trying %%LOCALBASE%%/lib/ladspa"); -+ strcpy(ladspa_path, "%%LOCALBASE%%/lib/ladspa"); - } - else strncpy(ladspa_path, ladspa_path_ptr, sizeof(ladspa_path)); - diff --git a/audio/terminatorx/files/patch-src_tX__mouse.cc b/audio/terminatorx/files/patch-src_tX__mouse.cc deleted file mode 100644 index d29eba378cb6..000000000000 --- a/audio/terminatorx/files/patch-src_tX__mouse.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tX_mouse.cc.orig 2018-11-07 18:49:45 UTC -+++ src/tX_mouse.cc -@@ -37,9 +37,9 @@ - #include "tX_global.h" - #include "tX_engine.h" - #include "tX_vtt.h" --#include <stdlib.h> -+#include <cstdlib> - #include <string.h> --#include <math.h> -+#include <cmath> - - #define TX_MOUSE_SPEED_NORMAL 0.05 - #define TX_MOUSE_SPEED_WARP 250000 diff --git a/audio/terminatorx/files/patch-src_tX__mouse.h b/audio/terminatorx/files/patch-src_tX__mouse.h deleted file mode 100644 index 2de3f7430e3b..000000000000 --- a/audio/terminatorx/files/patch-src_tX__mouse.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tX_mouse.h.orig 2011-01-30 21:01:32 UTC -+++ src/tX_mouse.h -@@ -34,7 +34,7 @@ - #include <X11/extensions/XInput.h> - #include <X11/keysym.h> - #include <glib.h> --#include <gdk/gdk.h> -+#include <gtk/gtk.h> - #include <gdk/gdkkeysyms.h> - - /* Use old gdk keys if the new ones are not yet defined */ diff --git a/audio/terminatorx/pkg-descr b/audio/terminatorx/pkg-descr deleted file mode 100644 index ac1e1e62b299..000000000000 --- a/audio/terminatorx/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -terminatorX is a realtime audio synthesizer that allows you to "scratch" -on digitally sampled audio data (*.wav, *.au, *.mp3, etc.) the way -hiphop-DJs scratch on vinyl records. - -It features multiple turntables, realtime effects (built-in as well as -LADSPA plugin effects), a sequencer and an easy-to-use gtk+ GUI. - -WWW: http://www.terminatorx.org/ diff --git a/audio/terminatorx/pkg-plist b/audio/terminatorx/pkg-plist deleted file mode 100644 index c16806229a58..000000000000 --- a/audio/terminatorx/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -bin/terminatorX -man/man1/terminatorX.1.gz -share/applications/terminatorX.desktop -share/gnome/help/terminatorX/C/figures/signalflow.png -share/gnome/help/terminatorX/C/terminatorX.xml -share/mime-info/terminatorX.keys -share/mime-info/terminatorX.mime -share/omf/terminatorX/terminatorX-C.omf -share/pixmaps/terminatorX-mime.png -share/pixmaps/terminatorX.png diff --git a/databases/Makefile b/databases/Makefile index d48a483c7781..ff2c49249d0b 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -200,8 +200,6 @@ SUBDIR += memcacheq SUBDIR += metakit SUBDIR += monetdb - SUBDIR += mongodb32 - SUBDIR += mongodb32-tools SUBDIR += mongodb34 SUBDIR += mongodb34-tools SUBDIR += mongodb36 diff --git a/databases/mongodb32-tools/Makefile b/databases/mongodb32-tools/Makefile deleted file mode 100644 index 0add98e2266e..000000000000 --- a/databases/mongodb32-tools/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net> -# $FreeBSD$ - -PORTNAME= mongodb32-tools -PORTVERSION= 3.2.11 -DISTVERSIONPREFIX= r -CATEGORIES= databases net - -MAINTAINER= ports@FreeBSD.org -COMMENT= Tools for MongoDB - -LICENSE= APACHE20 - -DEPRECATED= EOL upstream since September 2018 -EXPIRATION_DATE=2018-12-31 - -BROKEN_SSL= openssl111 libressl libressl-devel -BROKEN_SSL_REASON_openssl111= variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st') -BROKEN_SSL_REASON_libressl= could not determine kind of name for C.EVP_sha -BROKEN_SSL_REASON_libressl-devel= ${BROKEN_SSL_REASON_libressl} - -BUILD_DEPENDS= go>0:lang/go - -USE_GITHUB= yes -GH_ACCOUNT= mongodb -GH_PROJECT= mongo-tools - -OPTIONS_DEFINE= SSL SASL DOCS -OPTIONS_DEFAULT= SSL - -SASL_USE= my_tags=sasl -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 - -SSL_USES= ssl -SSL_USE= my_tags=ssl - -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than i386 and amd64" - -# Go is not our friend. Without below, ignores user-supplied flags. -MAKE_CMD= ${LOCALBASE}/bin/go build -MAKE_ENV= GOPATH="${WRKSRC}/.gopath:${WRKSRC}/vendor" \ - CGO_CFLAGS="${CFLAGS}" CGO_CPPFLAGS="${CPPFLAGS}" \ - CGO_CXXFLAGS="${CXXFLAGS}" CGO_LDFLAGS="${LDFLAGS}" - -USES= localbase -MY_TAGS= -tags "${USE_MY_TAGS}" - -post-patch: - @cd ${WRKSRC} ; ${MKDIR} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT} ; \ - ${LN} -sf ${WRKSRC} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} - -do-build: -.for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ - -o ${WRKSRC}/bin/${x} ${MY_TAGS}\ - -ldflags "-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/common/options.Gitspec=${GH_TAGNAME}"\ - ${WRKSRC}/${x}/main/${x}.go -.endfor - -do-install: -.for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${x} ${STAGEDIR}${PREFIX}/bin/ -.endfor - - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for x in LICENSE.md README.md THIRD-PARTY-NOTICES - ${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} -.endfor - -.include <bsd.port.mk> diff --git a/databases/mongodb32-tools/distinfo b/databases/mongodb32-tools/distinfo deleted file mode 100644 index ff48e9affd4e..000000000000 --- a/databases/mongodb32-tools/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1480077778 -SHA256 (mongodb-mongo-tools-r3.2.11_GH0.tar.gz) = 992e9fb94df6bed49e68684afee096f1193dc9cfca8ce8bcc4c912996bba365c -SIZE (mongodb-mongo-tools-r3.2.11_GH0.tar.gz) = 2712014 diff --git a/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go b/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go deleted file mode 100644 index 6e35a6a6149f..000000000000 --- a/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go +++ /dev/null @@ -1,9 +0,0 @@ ---- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig 2016-08-30 17:14:55 UTC -+++ vendor/src/github.com/spacemonkeygo/openssl/build.go -@@ -19,5 +19,6 @@ package openssl - // #cgo linux pkg-config: openssl - // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN - // #cgo darwin CFLAGS: -Wno-deprecated-declarations -+// #cgo freebsd LDFLAGS: -lssl -lcrypto - // #cgo darwin LDFLAGS: -lssl -lcrypto - import "C" diff --git a/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go b/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go deleted file mode 100644 index 17dc773143bf..000000000000 --- a/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/src/github.com/spacemonkeygo/openssl/init_posix.go.orig 2016-01-03 17:52:58 UTC -+++ vendor/src/github.com/spacemonkeygo/openssl/init_posix.go -@@ -12,7 +12,7 @@ - // See the License for the specific language governing permissions and - // limitations under the License. - --// +build linux darwin cgo -+// +build linux darwin freebsd cgo - // +build !windows - - package openssl diff --git a/databases/mongodb32-tools/pkg-descr b/databases/mongodb32-tools/pkg-descr deleted file mode 100644 index 0894b03e17d7..000000000000 --- a/databases/mongodb32-tools/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Since MongoDB 3.2, the tools bsondump, mongoimport, mongoexport, mongodump, -mongorestore, mongostat, mongofiles, mongooplog and mongotop have been placed -in a separate package and rewritten in Go. These are useful utilities for -managing a MongoDB instance. - -WWW: https://github.com/mongodb/mongo-tools diff --git a/databases/mongodb32-tools/pkg-plist b/databases/mongodb32-tools/pkg-plist deleted file mode 100644 index 07389cef6136..000000000000 --- a/databases/mongodb32-tools/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -bin/bsondump -bin/mongodump -bin/mongoexport -bin/mongofiles -bin/mongoimport -bin/mongooplog -bin/mongorestore -bin/mongostat -bin/mongotop -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES diff --git a/databases/mongodb32/Makefile b/databases/mongodb32/Makefile deleted file mode 100644 index a6729d306853..000000000000 --- a/databases/mongodb32/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net> -# $FreeBSD$ - -PORTNAME= mongodb32 -PORTVERSION= 3.2.11 -PORTREVISION= 2 -DISTVERSIONPREFIX= r -CATEGORIES= databases net -MASTER_SITES= https://fastdl.mongodb.org/src/ \ - http://fastdl.mongodb.org/src/ \ - http://download.mongodb.org/src/ -DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Distributed document-oriented "NoSQL" database - -# mongodb is AGPLv3, C++ driver is APACHE20 -LICENSE= AGPLv3 APACHE20 -LICENSE_COMB= multi - -DEPRECATED= EOL upstream since September 2018 -EXPIRATION_DATE=2018-12-31 - -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st') -LIB_DEPENDS= libpcre.so:devel/pcre \ - libsnappy.so:archivers/snappy -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo@${PY_FLAVOR} - -CHOSEN_COMPILER_TYPE= clang - -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)" - -CONFLICTS_BUILD= mongo-cxx-driver -OPTIONS_DEFINE= SASL SSL -OPTIONS_DEFAULT= SASL SSL - -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_MAKE_ARGS= --use-sasl-client - -SSL_USE= yes -SSL_MAKE_ARGS= --ssl - -USES= compiler cpe python:build scons - -MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ - --use-system-pcre --use-system-snappy \ - --release - -USERS= mongodb -GROUPS= mongodb - -USE_RC_SUBR= mongod - -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - -ALL_TARGET= core -TEST_TARGET= unittests - -.include <bsd.port.pre.mk> - -# Bugs when compiled with < Clang 3.7 -# - https://jira.mongodb.org/browse/SERVER-21217 -# - https://jira.mongodb.org/browse/SERVER-22740 -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 37 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang40:devel/llvm40 -CPP= ${LOCALBASE}/bin/clang-cpp40 -CC= ${LOCALBASE}/bin/clang40 -CXX= ${LOCALBASE}/bin/clang++40 -.endif - -post-install: -.for f in mongo mongod mongoperf mongos mongosniff - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} -.endfor - ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample - -do-test: - @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\ - ${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\ - --suites=unittests --jobs=${MAKE_JOBS_NUMBER} - -PORTSCOUT= limitw:1,even - -CPE_PRODUCT= mongodb - -.include <bsd.port.post.mk> diff --git a/databases/mongodb32/distinfo b/databases/mongodb32/distinfo deleted file mode 100644 index 1164d458bf01..000000000000 --- a/databases/mongodb32/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1480077698 -SHA256 (mongodb-src-r3.2.11.tar.gz) = 625eb28fd47b2af63b30343a064de7f42e5265f4c642874ec766ba3643fd80d7 -SIZE (mongodb-src-r3.2.11.tar.gz) = 29113706 diff --git a/databases/mongodb32/files/mongod.in b/databases/mongodb32/files/mongod.in deleted file mode 100644 index 94a538b46668..000000000000 --- a/databases/mongodb32/files/mongod.in +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -# PROVIDE: mongod -# REQUIRE: NETWORK ldconfig -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# mongod_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable mongod. -%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` -%%LEGACY_LIMITS%%# just before mongod starts. -# mongod_dbpath (str): Default to "/var/db/mongodb" -# Base database directory. -# mongod_flags (str): Custom additional arguments to be passed to mongod. -# Default to "--logpath ${mongod_dbpath}/mongod.log --logappend". -# mongod_config (str): Default to "%%PREFIX%%/etc/mongodb.conf" -# Path to config file -# - -. /etc/rc.subr - -name="mongod" -rcvar=mongod_enable - -load_rc_config $name - -: ${mongod_enable="NO"} -%%LEGACY_LIMITS%%: ${mongod_limits="NO"} -: ${mongod_dbpath="/var/db/mongodb"} -: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"} -: ${mongod_user="mongodb"} -: ${mongod_group="mongodb"} -: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"} - -pidfile="${mongod_dbpath}/mongod.lock" -command=%%PREFIX%%/bin/${name} -command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null" -start_precmd="${name}_prestart" - -mongod_create_dbpath() -{ - mkdir ${mongod_dbpath} >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath} -} - - -mongod_prestart() -{ - if [ ! -d ${mongod_dbpath} ]; then - mongod_create_dbpath || return 1 - fi -%%LEGACY_LIMITS%% if checkyesno mongod_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 -} - -run_rc_command "$1" diff --git a/databases/mongodb32/files/patch-SConstruct b/databases/mongodb32/files/patch-SConstruct deleted file mode 100644 index 0fcfc03ac7de..000000000000 --- a/databases/mongodb32/files/patch-SConstruct +++ /dev/null @@ -1,15 +0,0 @@ ---- SConstruct.orig 2015-12-02 19:01:34 UTC -+++ SConstruct -@@ -840,9 +840,9 @@ if has_option('variables-help'): - print env_vars.GenerateHelpText(env) - Exit(0) - --unknown_vars = env_vars.UnknownVariables() --if unknown_vars: -- env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) -+#unknown_vars = env_vars.UnknownVariables() -+#if unknown_vars: -+# env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) - - def set_config_header_define(env, varname, varval = 1): - env['CONFIG_HEADER_DEFINES'][varname] = varval diff --git a/databases/mongodb32/files/patch-pcre b/databases/mongodb32/files/patch-pcre deleted file mode 100644 index c0b79532f490..000000000000 --- a/databases/mongodb32/files/patch-pcre +++ /dev/null @@ -1,311 +0,0 @@ -From 18f4c63869a32426bd33235a8cf51f06809a1b6b Mon Sep 17 00:00:00 2001 -From: Steven Green <steven@greenius.co.uk> -Date: Tue, 22 Aug 2017 13:08:48 -0400 -Subject: [PATCH] SERVER-30166 Replace string with explicit std::string. - Enables compulation when using --use-system-pcre which presusably used to do - 'using std::string' in an earlier version of pcre - -Closes #1167 - -Signed-off-by: Mark Benvenuto <mark.benvenuto@mongodb.com> -(cherry picked from commit b7cebf82bc5e5572308cc3a3fb958a825db91498) ---- - src/mongo/db/dbwebserver.cpp | 1 + - src/mongo/db/matcher/expression_leaf.cpp | 4 +- - src/mongo/db/repl/master_slave.cpp | 41 ++-- - .../sharding_catalog_create_database_test.cpp | 216 +++++++++++++++++++++ - src/mongo/shell/bench.cpp | 14 +- - src/mongo/util/net/miniwebserver.cpp | 1 + - 6 files changed, 248 insertions(+), 29 deletions(-) - create mode 100644 src/mongo/s/catalog/sharding_catalog_create_database_test.cpp - -diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp -index bee10b95a5b..055ce27aacf 100644 ---- src/mongo/db/dbwebserver.cpp -+++ src/mongo/db/dbwebserver.cpp -@@ -67,6 +67,7 @@ - namespace mongo { - - using std::map; -+using std::string; - using std::stringstream; - using std::vector; - -diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp -index cfcd3d03591..5b658640578 100644 ---- src/mongo/db/matcher/expression_leaf.cpp -+++ src/mongo/db/matcher/expression_leaf.cpp -@@ -200,7 +200,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con - } - - void ComparisonMatchExpression::toBSON(BSONObjBuilder* out) const { -- string opString = ""; -+ std::string opString = ""; - switch (matchType()) { - case LT: - opString = "$lt"; -@@ -880,7 +880,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const - } - - void BitTestMatchExpression::toBSON(BSONObjBuilder* out) const { -- string opString = ""; -+ std::string opString = ""; - - switch (matchType()) { - case BITS_ALL_SET: -diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp -index d7503c4d689..3a60f351758 100644 ---- src/mongo/shell/bench.cpp -+++ src/mongo/shell/bench.cpp -@@ -674,7 +674,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess); - - if (_config->username != "") { -- string errmsg; -+ std::string errmsg; - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg); - } -@@ -920,7 +920,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - - if (!result["err"].eoo() && result["err"].type() == String && - (_config->throwGLE || op.throwGLE)) -- throw DBException((string) "From benchRun GLE" + -+ throw DBException((std::string) "From benchRun GLE" + - causedBy(result["err"].String()), - result["code"].eoo() ? 0 : result["code"].Int()); - } -@@ -987,7 +987,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - - if (!result["err"].eoo() && result["err"].type() == String && - (_config->throwGLE || op.throwGLE)) -- throw DBException((string) "From benchRun GLE" + -+ throw DBException((std::string) "From benchRun GLE" + - causedBy(result["err"].String()), - result["code"].eoo() ? 0 : result["code"].Int()); - } -@@ -1035,7 +1035,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - - if (!result["err"].eoo() && result["err"].type() == String && - (_config->throwGLE || op.throwGLE)) -- throw DBException((string) "From benchRun GLE " + -+ throw DBException((std::string) "From benchRun GLE " + - causedBy(result["err"].String()), - result["code"].eoo() ? 0 : result["code"].Int()); - } -@@ -1136,7 +1136,7 @@ void BenchRunWorker::run() { - try { - std::unique_ptr<DBClientBase> conn(_config->createConnection()); - if (!_config->username.empty()) { -- string errmsg; -+ std::string errmsg; - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg); - } -@@ -1168,7 +1168,7 @@ void BenchRunner::start() { - std::unique_ptr<DBClientBase> conn(_config->createConnection()); - // Must authenticate to admin db in order to run serverStatus command - if (_config->username != "") { -- string errmsg; -+ std::string errmsg; - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(16704, - str::stream() -@@ -1204,7 +1204,7 @@ void BenchRunner::stop() { - { - std::unique_ptr<DBClientBase> conn(_config->createConnection()); - if (_config->username != "") { -- string errmsg; -+ std::string errmsg; - // this can only fail if admin access was revoked since start of run - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(16705, -diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp -index fc86f95b24f..369f23f136a 100644 ---- src/mongo/util/net/miniwebserver.cpp -+++ src/mongo/util/net/miniwebserver.cpp -@@ -43,6 +43,7 @@ namespace mongo { - - using std::shared_ptr; - using std::endl; -+using std::string; - using std::stringstream; - using std::vector; - ---- src/mongo/db/repl/master_slave.cpp.orig -+++ src/mongo/db/repl/master_slave.cpp -@@ -161,7 +161,7 @@ - - BSONObjBuilder dbsNextPassBuilder; - int n = 0; -- for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { -+ for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { - n++; - dbsNextPassBuilder.appendBool(*i, 1); - } -@@ -170,7 +170,8 @@ - - BSONObjBuilder incompleteCloneDbsBuilder; - n = 0; -- for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) { -+ for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); -+ i++) { - n++; - incompleteCloneDbsBuilder.appendBool(*i, 1); - } -@@ -181,7 +182,7 @@ - } - - void ReplSource::ensureMe(OperationContext* txn) { -- string myname = getHostName(); -+ std::string myname = getHostName(); - - // local.me is an identifier for a server for getLastError w:2+ - bool exists = Helpers::getSingleton(txn, "local.me", _me); -@@ -373,10 +374,10 @@ - } - - virtual bool run(OperationContext* txn, -- const string& ns, -+ const std::string& ns, - BSONObj& cmdObj, - int options, -- string& errmsg, -+ std::string& errmsg, - BSONObjBuilder& result) { - HandshakeArgs handshake; - Status status = handshake.initialize(cmdObj); -@@ -393,7 +394,7 @@ - } handshakeCmd; - - bool replHandshake(DBClientConnection* conn, const OID& myRID) { -- string myname = getHostName(); -+ std::string myname = getHostName(); - - BSONObjBuilder cmd; - cmd.append("handshake", myRID); -@@ -445,7 +446,7 @@ - BSONElement e = i.next(); - if (e.eoo()) - break; -- string name = e.embeddedObject().getField("name").valuestr(); -+ std::string name = e.embeddedObject().getField("name").valuestr(); - if (!e.embeddedObject().getBoolField("empty")) { - if (name != "local") { - if (only.empty() || only == name) { -@@ -459,7 +460,7 @@ - save(txn); - } - --void ReplSource::resyncDrop(OperationContext* txn, const string& db) { -+void ReplSource::resyncDrop(OperationContext* txn, const std::string& db) { - log() << "resync: dropping database " << db; - OldClientContext ctx(txn, db); - dropDatabase(txn, ctx.db()); -@@ -502,13 +503,13 @@ - - static DatabaseIgnorer ___databaseIgnorer; - --void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) { -+void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) { - if (futureOplogTime > _ignores[db]) { - _ignores[db] = futureOplogTime; - } - } - --bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) { -+bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) { - if (_ignores[db].isNull()) { - return false; - } -@@ -594,12 +595,12 @@ - } - - // Check for duplicates again, since we released the lock above. -- set<string> duplicates; -+ set<std::string> duplicates; - Database::duplicateUncasedName(db, &duplicates); - - // The database is present on the master and no conflicting databases - // are present on the master. Drop any local conflicts. -- for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { -+ for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { - ___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime); - incompleteCloneDbs.erase(*i); - addDbNextPass.erase(*i); -@@ -794,10 +795,10 @@ - } - - void ReplSource::syncToTailOfRemoteLog() { -- string _ns = ns(); -+ std::string _ns = ns(); - BSONObjBuilder b; - if (!only.empty()) { -- b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only)); -+ b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only)); - } - BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1))); - if (!last.isEmpty()) { -@@ -845,7 +846,7 @@ - */ - int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { - int okResultCode = 1; -- string ns = string("local.oplog.$") + sourceName(); -+ std::string ns = std::string("local.oplog.$") + sourceName(); - LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n'; - - bool tailing = true; -@@ -865,7 +866,7 @@ - BSONElement e = i.next(); - if (e.eoo()) - break; -- string name = e.embeddedObject().getField("name").valuestr(); -+ std::string name = e.embeddedObject().getField("name").valuestr(); - if (!e.embeddedObject().getBoolField("empty")) { - if (name != "local") { - if (only.empty() || only == name) { -@@ -889,7 +890,7 @@ - if (!only.empty()) { - // note we may here skip a LOT of data table scanning, a lot of work for the master. - // maybe append "\\." here? -- query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only)); -+ query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only)); - } - BSONObj queryObj = query.done(); - // e.g. queryObj = { ts: { $gte: syncedTo } } -@@ -908,7 +909,7 @@ - - // show any deferred database creates from a previous pass - { -- set<string>::iterator i = addDbNextPass.begin(); -+ set<std::string>::iterator i = addDbNextPass.begin(); - if (i != addDbNextPass.end()) { - BSONObjBuilder b; - b.append("ns", *i + '.'); -@@ -939,7 +940,7 @@ - BSONObj op = oplogReader.next(); - BSONElement ts = op.getField("ts"); - if (ts.type() != Date && ts.type() != bsonTimestamp) { -- string err = op.getStringField("$err"); -+ std::string err = op.getStringField("$err"); - if (!err.empty()) { - // 13051 is "tailable cursor requested on non capped collection" - if (op.getIntField("code") == 13051) { -@@ -1107,7 +1108,7 @@ - - // FIXME Handle cases where this db isn't on default port, or default port is spec'd in - // hostName. -- if ((string("localhost") == hostName || string("127.0.0.1") == hostName) && -+ if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) && - serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) { - log() << "can't sync from self (localhost). sources configuration may be wrong." << endl; - sleepsecs(5); -@@ -1252,7 +1253,7 @@ - if (s) { - stringstream ss; - ss << "sleep " << s << " sec before next pass"; -- string msg = ss.str(); -+ std::string msg = ss.str(); - if (!serverGlobalParams.quiet) - log() << msg << endl; - ReplInfo r(msg.c_str()); diff --git a/databases/mongodb32/files/patch-rpm_mongod.conf b/databases/mongodb32/files/patch-rpm_mongod.conf deleted file mode 100644 index 52159af5fb27..000000000000 --- a/databases/mongodb32/files/patch-rpm_mongod.conf +++ /dev/null @@ -1,31 +0,0 @@ ---- rpm/mongod.conf.orig 2016-03-01 04:38:06 UTC -+++ rpm/mongod.conf -@@ -1,4 +1,4 @@ --# mongod.conf -+# mongodb.conf - - # for documentation of all options, see: - # http://docs.mongodb.org/manual/reference/configuration-options/ -@@ -7,11 +7,11 @@ - systemLog: - destination: file - logAppend: true -- path: /var/log/mongodb/mongod.log -+ path: /var/log/mongodb/log - - # Where and how to store data. - storage: -- dbPath: /var/lib/mongo -+ dbPath: /var/db/mongo - journal: - enabled: true - # engine: -@@ -21,7 +21,7 @@ storage: - # how the process runs - processManagement: - fork: true # fork and run in background -- pidFilePath: /var/run/mongodb/mongod.pid # location of pidfile -+ pidFilePath: /var/run/mongodb/pid # location of pidfile - - # network interfaces - net: diff --git a/databases/mongodb32/pkg-descr b/databases/mongodb32/pkg-descr deleted file mode 100644 index 24f53e80363b..000000000000 --- a/databases/mongodb32/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Mongo (from "humongous") is a high-performance, open source, -schema-free, document-oriented database. A common name in the -"NOSQL" community. - -WWW: http://www.mongodb.org/ diff --git a/databases/mongodb32/pkg-plist b/databases/mongodb32/pkg-plist deleted file mode 100644 index fbc480c26786..000000000000 --- a/databases/mongodb32/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -@sample etc/mongodb.conf.sample -bin/mongo -bin/mongod -bin/mongoperf -bin/mongos -bin/mongosniff diff --git a/dns/Makefile b/dns/Makefile index ddc284d671c7..a446f77031d0 100644 --- a/dns/Makefile +++ b/dns/Makefile @@ -179,7 +179,6 @@ SUBDIR += pear-Net_DNS2 SUBDIR += powerdns SUBDIR += powerdns-recursor - SUBDIR += powerdns-recursor40 SUBDIR += public_suffix_list SUBDIR += py-adns SUBDIR += py-aiodns diff --git a/dns/powerdns-recursor40/Makefile b/dns/powerdns-recursor40/Makefile deleted file mode 100644 index e25011d3ac60..000000000000 --- a/dns/powerdns-recursor40/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# Created by: sten@blinkenlights.nl -# $FreeBSD$ - -PORTNAME= recursor -DISTVERSION= 4.0.9 -PORTREVISION?= 3 -CATEGORIES= dns ipv6 -MASTER_SITES= http://downloads.powerdns.com/releases/ -PKGNAMEPREFIX= powerdns- -PKGNAMESUFFIX= 40 -DISTNAME= pdns-${PORTNAME}-${DISTVERSION} - -MAINTAINER= tremere@cainites.net -COMMENT= Advanced DNS recursor - -LICENSE= GPLv2 - -DEPRECATED= FreeBSD 10.3 has reached EoL since 2018-04-30; users should upgrade and use dns/powerdns-recursor instead -EXPIRATION_DATE= 2018-12-31 - -BROKEN_armv6= fails to compile: use of overloaded operator << is ambiguous -BROKEN_armv7= fails to compile: use of overloaded operator << is ambiguous -BROKEN_sparc64= fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt -BROKEN_powerpc64= fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string - -BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs -LIB_DEPENDS= libboost_context.so:devel/boost-libs \ - libprotobuf.so:devel/protobuf - -CONFLICTS_INSTALL= powerdns-recursor - -USES= compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2 -GNU_CONFIGURE= YES -CXXFLAGS+= -D_GLIBCXX_USE_C99 -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/pdns \ - --with-protobuf - -CPE_VENDOR= powerdns - -USE_RC_SUBR= pdns-recursor - -OPTIONS_DEFINE= OPTALGO SETUID -OPTIONS_DEFAULT= LUA SETUID -OPTIONS_RADIO= LUA_RG -OPTIONS_RADIO_LUA_RG= LUA LUAJIT -LUAJIT_DESC= Enable LuaJIT -LUA_RG_DESC= Lua Engine -OPTALGO_DESC= Enable optional algorithms (12, 15 & 16) -SETUID_DESC= Run as pdns_recursor user - -LUA_CONFIGURE_WITH= lua -LUA_USES= lua - -LUAJIT_CONFIGURE_WITH= luajit -LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit - -OPTALGO_CONFIGURE_ON= --enable-botan \ - --enable-libdecaf \ - --enable-libsodium -OPTALGO_LIB_DEPENDS= libbotan-2.so:security/botan2 \ - libdecaf.so:security/libdecaf \ - libsodium.so:security/libsodium - -SETUID_VARS= USERS=pdns_recursor GROUPS=pdns -SETUID_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-setuid - -SUB_FILES= pkg-message - -.include <bsd.port.mk> diff --git a/dns/powerdns-recursor40/distinfo b/dns/powerdns-recursor40/distinfo deleted file mode 100644 index 3b076f973390..000000000000 --- a/dns/powerdns-recursor40/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1541587471 -SHA256 (pdns-recursor-4.0.9.tar.bz2) = a4d8cf2401488c0a2d9c5f97bb6ebf135243edf2272aa66aa3855f94551fe8b8 -SIZE (pdns-recursor-4.0.9.tar.bz2) = 1117598 diff --git a/dns/powerdns-recursor40/files/extrapatch-setuid b/dns/powerdns-recursor40/files/extrapatch-setuid deleted file mode 100644 index 4ab90f53ac4f..000000000000 --- a/dns/powerdns-recursor40/files/extrapatch-setuid +++ /dev/null @@ -1,13 +0,0 @@ ---- pdns_recursor.cc.orig 2017-01-17 02:48:30 UTC -+++ pdns_recursor.cc -@@ -2969,8 +2969,8 @@ int main(int argc, char **argv) - ::arg().set("disable-syslog","Disable logging to syslog, useful when running inside a supervisor that logs stdout")="no"; - ::arg().set("log-common-errors","If we should log rather common errors")="no"; - ::arg().set("chroot","switch to chroot jail")=""; -- ::arg().set("setgid","If set, change group id to this gid for more security")=""; -- ::arg().set("setuid","If set, change user id to this uid for more security")=""; -+ ::arg().set("setgid","If set, change group id to this gid for more security")="pdns"; -+ ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor"; - ::arg().set("network-timeout", "Wait this nummer of milliseconds for network i/o")="1500"; - ::arg().set("threads", "Launch this number of threads")="2"; - ::arg().set("processes", "Launch this number of processes (EXPERIMENTAL, DO NOT CHANGE)")="1"; // if we un-experimental this, need to fix openssl rand seeding for multiple PIDs! diff --git a/dns/powerdns-recursor40/files/patch-boost-1.67 b/dns/powerdns-recursor40/files/patch-boost-1.67 deleted file mode 100644 index 217c3d6f8c0a..000000000000 --- a/dns/powerdns-recursor40/files/patch-boost-1.67 +++ /dev/null @@ -1,2230 +0,0 @@ -https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 - ---- arguments.cc.orig 2018-11-06 14:56:58 UTC -+++ arguments.cc -@@ -443,7 +443,7 @@ bool ArgvMap::file(const char *fname, bo - set("include-dir","Directory to include configuration files from"); - - if(!parseFile(fname, "", lax)) { -- L << Logger::Warning << "Unable to open " << fname << std::endl; -+ g_log << Logger::Warning << "Unable to open " << fname << std::endl; - return false; - } - -@@ -453,7 +453,7 @@ bool ArgvMap::file(const char *fname, bo - gatherIncludes(extraConfigs); - for(const std::string& fn : extraConfigs) { - if (!file(fn.c_str(), lax, true)) { -- L << Logger::Error << fn << " could not be parsed" << std::endl; -+ g_log << Logger::Error << fn << " could not be parsed" << std::endl; - throw ArgException(fn + " could not be parsed"); - } - } -@@ -471,18 +471,18 @@ void ArgvMap::gatherIncludes(std::vector - - // stat - if (stat(params["include-dir"].c_str(), &st)) { -- L << Logger::Error << params["include-dir"] << " does not exist!" << std::endl; -+ g_log << Logger::Error << params["include-dir"] << " does not exist!" << std::endl; - throw ArgException(params["include-dir"] + " does not exist!"); - } - - // wonder if it's accessible directory - if (!S_ISDIR(st.st_mode)) { -- L << Logger::Error << params["include-dir"] << " is not a directory" << std::endl; -+ g_log << Logger::Error << params["include-dir"] << " is not a directory" << std::endl; - throw ArgException(params["include-dir"] + " is not a directory"); - } - - if (!(dir = opendir(params["include-dir"].c_str()))) { -- L << Logger::Error << params["include-dir"] << " is not accessible" << std::endl; -+ g_log << Logger::Error << params["include-dir"] << " is not accessible" << std::endl; - throw ArgException(params["include-dir"] + " is not accessible"); - } - -@@ -494,7 +494,7 @@ void ArgvMap::gatherIncludes(std::vector - namebuf << params["include-dir"].c_str() << "/" << ent->d_name; // FIXME: Use some path separator - // ensure it's readable file - if (stat(namebuf.str().c_str(), &st) || !S_ISREG(st.st_mode)) { -- L << Logger::Error << namebuf.str() << " is not a file" << std::endl; -+ g_log << Logger::Error << namebuf.str() << " is not a file" << std::endl; - closedir(dir); - throw ArgException(namebuf.str() + " does not exist!"); - } ---- dns.hh.orig 2018-11-06 14:56:58 UTC -+++ dns.hh -@@ -241,7 +241,6 @@ inline uint16_t * getFlagsFromDNSHeader( - #define FLAGS_CD_OFFSET (12) - #endif - --#define L theL() - extern time_t s_starttime; - - uint32_t hashQuestion(const char* packet, uint16_t len, uint32_t init); ---- gss_context.cc.orig 2018-11-06 14:56:58 UTC -+++ gss_context.cc -@@ -456,17 +456,17 @@ bool gss_add_signature(const DNSName& co - string tmp_mac; - GssContext gssctx(context); - if (!gssctx.valid()) { -- L<<Logger::Error<<"GSS context '"<<context<<"' is not valid"<<endl; -+ g_log<<Logger::Error<<"GSS context '"<<context<<"' is not valid"<<endl; - for(const string& error : gssctx.getErrorStrings()) { -- L<<Logger::Error<<"GSS error: "<<error<<endl;; -+ g_log<<Logger::Error<<"GSS error: "<<error<<endl;; - } - return false; - } - - if (!gssctx.sign(message, tmp_mac)) { -- L<<Logger::Error<<"Could not sign message using GSS context '"<<context<<"'"<<endl; -+ g_log<<Logger::Error<<"Could not sign message using GSS context '"<<context<<"'"<<endl; - for(const string& error : gssctx.getErrorStrings()) { -- L<<Logger::Error<<"GSS error: "<<error<<endl;; -+ g_log<<Logger::Error<<"GSS error: "<<error<<endl;; - } - return false; - } -@@ -477,17 +477,17 @@ bool gss_add_signature(const DNSName& co - bool gss_verify_signature(const DNSName& context, const std::string& message, const std::string& mac) { - GssContext gssctx(context); - if (!gssctx.valid()) { -- L<<Logger::Error<<"GSS context '"<<context<<"' is not valid"<<endl; -+ g_log<<Logger::Error<<"GSS context '"<<context<<"' is not valid"<<endl; - for(const string& error : gssctx.getErrorStrings()) { -- L<<Logger::Error<<"GSS error: "<<error<<endl;; -+ g_log<<Logger::Error<<"GSS error: "<<error<<endl;; - } - return false; - } - - if (!gssctx.verify(message, mac)) { -- L<<Logger::Error<<"Could not verify message using GSS context '"<<context<<"'"<<endl; -+ g_log<<Logger::Error<<"Could not verify message using GSS context '"<<context<<"'"<<endl; - for(const string& error : gssctx.getErrorStrings()) { -- L<<Logger::Error<<"GSS error: "<<error<<endl;; -+ g_log<<Logger::Error<<"GSS error: "<<error<<endl;; - } - return false; - } ---- logger.cc.orig 2018-11-06 14:56:58 UTC -+++ logger.cc -@@ -32,15 +32,9 @@ extern StatBag S; - #include "namespaces.hh" - - pthread_once_t Logger::s_once; --pthread_key_t Logger::s_loggerKey; -+pthread_key_t Logger::g_loggerKey; - --Logger &theL(const string &pname) --{ -- static Logger l("", LOG_DAEMON); -- if(!pname.empty()) -- l.setName(pname); -- return l; --} -+Logger g_log("", LOG_DAEMON); - - void Logger::log(const string &msg, Urgency u) - { -@@ -102,7 +96,7 @@ void Logger::setName(const string &_name - - void Logger::initKey() - { -- if(pthread_key_create(&s_loggerKey, perThreadDestructor)) -+ if(pthread_key_create(&g_loggerKey, perThreadDestructor)) - unixDie("Creating thread key for logger"); - } - -@@ -137,13 +131,13 @@ void Logger::perThreadDestructor(void* b - - Logger::PerThread* Logger::getPerThread() - { -- void *buf=pthread_getspecific(s_loggerKey); -+ void *buf=pthread_getspecific(g_loggerKey); - PerThread* ret; - if(buf) - ret = (PerThread*) buf; - else { - ret = new PerThread(); -- pthread_setspecific(s_loggerKey, (void*)ret); -+ pthread_setspecific(g_loggerKey, (void*)ret); - } - return ret; - } ---- logger.hh.orig 2018-11-06 14:56:58 UTC -+++ logger.hh -@@ -66,9 +66,9 @@ public: - void resetFlags(){flags=0;open();} //!< zero the flags - /** Use this to stream to your log, like this: - \code -- L<<"This is an informational message"<<endl; // logged at default loglevel (Info) -- L<<Logger::Warning<<"Out of diskspace"<<endl; // Logged as a warning -- L<<"This is an informational message"<<endl; // logged AGAIN at default loglevel (Info) -+ g_log<<"This is an informational message"<<endl; // logged at default loglevel (Info) -+ g_log<<Logger::Warning<<"Out of diskspace"<<endl; // Logged as a warning -+ g_log<<"This is an informational message"<<endl; // logged AGAIN at default loglevel (Info) - \endcode - */ - Logger& operator<<(const char *s); -@@ -108,10 +108,10 @@ private: - bool opened; - bool d_disableSyslog; - static pthread_once_t s_once; -- static pthread_key_t s_loggerKey; -+ static pthread_key_t g_loggerKey; - }; - --extern Logger &theL(const string &pname=""); -+extern Logger g_log; - - #ifdef VERBOSELOG - #define DLOG(x) x ---- lua-recursor4.cc.orig 2018-11-06 14:56:58 UTC -+++ lua-recursor4.cc -@@ -78,7 +78,6 @@ int RecursorLua4::gettag(const ComboAddr - - - #else --#undef L - #include "ext/luawrapper/include/LuaContext.hpp" - - static int followCNAMERecords(vector<DNSRecord>& ret, const QType& qtype) -@@ -309,7 +308,7 @@ RecursorLua4::RecursorLua4(const std::st - cas.insert(boost::get<ComboAddress>(in)); - } - } -- catch(std::exception& e) { theL() <<Logger::Error<<e.what()<<endl; } -+ catch(std::exception& e) { g_log <<Logger::Error<<e.what()<<endl; } - }); - - d_lw->registerFunction<bool(cas_t::*)(const ComboAddress&)>("check",[](const cas_t& cas, const ComboAddress&ca) { -@@ -463,7 +462,7 @@ RecursorLua4::RecursorLua4(const std::st - } - } - catch(std::exception& e) { -- theL() <<Logger::Error<<e.what()<<endl; -+ g_log <<Logger::Error<<e.what()<<endl; - } - } - ); -@@ -473,7 +472,7 @@ RecursorLua4::RecursorLua4(const std::st - - - d_lw->writeFunction("pdnslog", [](const std::string& msg, boost::optional<int> loglevel) { -- theL() << (Logger::Urgency)loglevel.get_value_or(Logger::Warning) << msg<<endl; -+ g_log << (Logger::Urgency)loglevel.get_value_or(Logger::Warning) << msg<<endl; - }); - typedef vector<pair<string, int> > in_t; - vector<pair<string, boost::variant<int, in_t, struct timeval* > > > pd{ -@@ -649,7 +648,7 @@ loop:; - dq->udpAnswer = GenUDPQueryResponse(dq->udpQueryDest, dq->udpQuery); - auto cbFunc = d_lw->readVariable<boost::optional<luacall_t>>(dq->udpCallback).get_value_or(0); - if(!cbFunc) { -- theL()<<Logger::Error<<"Attempted callback for Lua UDP Query/Response which could not be found"<<endl; -+ g_log<<Logger::Error<<"Attempted callback for Lua UDP Query/Response which could not be found"<<endl; - return false; - } - bool result=cbFunc(dq); ---- lwres.cc.orig 2018-11-06 14:56:58 UTC -+++ lwres.cc -@@ -236,7 +236,7 @@ int asyncresolve(const ComboAddress& ip, - - if(domain != mdp.d_qname) { - if(!mdp.d_qname.empty() && domain.toString().find((char)0) == string::npos /* ugly */) {// embedded nulls are too noisy, plus empty domains are too -- L<<Logger::Notice<<"Packet purporting to come from remote server "<<ip.toString()<<" contained wrong answer: '" << domain << "' != '" << mdp.d_qname << "'" << endl; -+ g_log<<Logger::Notice<<"Packet purporting to come from remote server "<<ip.toString()<<" contained wrong answer: '" << domain << "' != '" << mdp.d_qname << "'" << endl; - } - // unexpected count has already been done @ pdns_recursor.cc - goto out; -@@ -276,7 +276,7 @@ int asyncresolve(const ComboAddress& ip, - } - catch(std::exception &mde) { - if(::arg().mustDo("log-common-errors")) -- L<<Logger::Notice<<"Unable to parse packet from remote server "<<ip.toString()<<": "<<mde.what()<<endl; -+ g_log<<Logger::Notice<<"Unable to parse packet from remote server "<<ip.toString()<<": "<<mde.what()<<endl; - lwr->d_rcode = RCode::FormErr; - g_stats.serverParseError++; - #ifdef HAVE_PROTOBUF -@@ -287,7 +287,7 @@ int asyncresolve(const ComboAddress& ip, - return 1; // success - oddly enough - } - catch(...) { -- L<<Logger::Notice<<"Unknown error parsing packet from remote server"<<endl; -+ g_log<<Logger::Notice<<"Unknown error parsing packet from remote server"<<endl; - } - - g_stats.serverParseError++; ---- pdns_recursor.cc.orig 2018-11-06 14:56:58 UTC -+++ pdns_recursor.cc -@@ -347,12 +347,12 @@ void setSocketBuffer(int fd, int optname - socklen_t len=sizeof(psize); - - if(!getsockopt(fd, SOL_SOCKET, optname, (char*)&psize, &len) && psize > size) { -- L<<Logger::Error<<"Not decreasing socket buffer size from "<<psize<<" to "<<size<<endl; -+ g_log<<Logger::Error<<"Not decreasing socket buffer size from "<<psize<<" to "<<size<<endl; - return; - } - - if (setsockopt(fd, SOL_SOCKET, optname, (char*)&size, sizeof(size)) < 0 ) -- L<<Logger::Error<<"Unable to raise socket buffer size to "<<size<<": "<<strerror(errno)<<endl; -+ g_log<<Logger::Error<<"Unable to raise socket buffer size to "<<size<<": "<<strerror(errno)<<endl; - } - - -@@ -395,7 +395,7 @@ public: - closesocket(*fd); - } - catch(const PDNSException& e) { -- L<<Logger::Error<<"Error closing UDP socket after connect() failed: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error closing UDP socket after connect() failed: "<<e.reason<<endl; - } - - if(err==ENETUNREACH) // Seth "My Interfaces Are Like A Yo Yo" Arnold special -@@ -433,7 +433,7 @@ public: - closesocket(*i); - } - catch(const PDNSException& e) { -- L<<Logger::Error<<"Error closing returned UDP socket: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error closing returned UDP socket: "<<e.reason<<endl; - } - - d_socks.erase(i++); -@@ -549,7 +549,7 @@ int arecvfrom(char *data, size_t len, in - *d_len=packet.size(); - memcpy(data,packet.c_str(),min(len,*d_len)); - if(*nearMissLimit && pident.nearMisses > *nearMissLimit) { -- L<<Logger::Error<<"Too many ("<<pident.nearMisses<<" > "<<*nearMissLimit<<") bogus answers for '"<<domain<<"' from "<<fromaddr.toString()<<", assuming spoof attempt."<<endl; -+ g_log<<Logger::Error<<"Too many ("<<pident.nearMisses<<" > "<<*nearMissLimit<<") bogus answers for '"<<domain<<"' from "<<fromaddr.toString()<<", assuming spoof attempt."<<endl; - g_stats.spoofCount++; - return -1; - } -@@ -571,7 +571,7 @@ static void writePid(void) - if(of) - of<< Utility::getpid() <<endl; - else -- L<<Logger::Error<<"Writing pid for "<<Utility::getpid()<<" to "<<s_pidfname<<" failed: "<<strerror(errno)<<endl; -+ g_log<<Logger::Error<<"Writing pid for "<<Utility::getpid()<<" to "<<s_pidfname<<" failed: "<<strerror(errno)<<endl; - } - - typedef map<ComboAddress, uint32_t, ComboAddress::addressOnlyLessThan> tcpClientCounts_t; -@@ -587,10 +587,10 @@ TCPConnection::~TCPConnection() - { - try { - if(closesocket(d_fd) < 0) -- L<<Logger::Error<<"Error closing socket for TCPConnection"<<endl; -+ g_log<<Logger::Error<<"Error closing socket for TCPConnection"<<endl; - } - catch(const PDNSException& e) { -- L<<Logger::Error<<"Error closing TCPConnection socket: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error closing TCPConnection socket: "<<e.reason<<endl; - } - - if(t_tcpClientCounts->count(d_remote) && !(*t_tcpClientCounts)[d_remote]--) -@@ -798,12 +798,12 @@ void startDoResolve(void *p) - - - if(!g_quiet || tracedQuery) { -- L<<Logger::Warning<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] " << (dc->d_tcp ? "TCP " : "") << "question for '"<<dc->d_mdp.d_qname<<"|" -+ g_log<<Logger::Warning<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] " << (dc->d_tcp ? "TCP " : "") << "question for '"<<dc->d_mdp.d_qname<<"|" - <<DNSRecordContent::NumberToType(dc->d_mdp.d_qtype)<<"' from "<<dc->getRemote(); - if(!dc->d_ednssubnet.source.empty()) { -- L<<" (ecs "<<dc->d_ednssubnet.source.toString()<<")"; -+ g_log<<" (ecs "<<dc->d_ednssubnet.source.toString()<<")"; - } -- L<<endl; -+ g_log<<endl; - } - - sr.setId(MT->getTid()); -@@ -866,7 +866,7 @@ void startDoResolve(void *p) - } - catch(ImmediateServFailException &e) { - if(g_logCommonErrors) -- L<<Logger::Notice<<"Sending SERVFAIL to "<<dc->getRemote()<<" during resolve of '"<<dc->d_mdp.d_qname<<"' because: "<<e.reason<<endl; -+ g_log<<Logger::Notice<<"Sending SERVFAIL to "<<dc->getRemote()<<" during resolve of '"<<dc->d_mdp.d_qname<<"' because: "<<e.reason<<endl; - res = RCode::ServFail; - } - -@@ -986,7 +986,7 @@ void startDoResolve(void *p) - boost::split(lines, trace, boost::is_any_of("\n")); - for(const string& line : lines) { - if(!line.empty()) -- L<<Logger::Warning<< line << endl; -+ g_log<<Logger::Warning<< line << endl; - } - } - } -@@ -1003,7 +1003,7 @@ void startDoResolve(void *p) - if(!shouldNotValidate && (g_dnssecmode == DNSSECMode::ValidateAll || g_dnssecmode==DNSSECMode::ValidateForLog || ((dc->d_mdp.d_header.ad || DNSSECOK) && g_dnssecmode==DNSSECMode::Process))) { - try { - if(sr.doLog()) { -- L<<Logger::Warning<<"Starting validation of answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<endl; -+ g_log<<Logger::Warning<<"Starting validation of answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<endl; - } - - ResolveContext ctx; -@@ -1013,7 +1013,7 @@ void startDoResolve(void *p) - auto state=validateRecords(ctx, ret); - if(state == Secure) { - if(sr.doLog()) { -- L<<Logger::Warning<<"Answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<" validates correctly"<<endl; -+ g_log<<Logger::Warning<<"Answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<" validates correctly"<<endl; - } - - // Is the query source interested in the value of the ad-bit? -@@ -1022,34 +1022,34 @@ void startDoResolve(void *p) - } - else if(state == Insecure) { - if(sr.doLog()) { -- L<<Logger::Warning<<"Answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<" validates as Insecure"<<endl; -+ g_log<<Logger::Warning<<"Answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<" validates as Insecure"<<endl; - } - - pw.getHeader()->ad=0; - } - else if(state == Bogus) { - if(g_dnssecLogBogus || sr.doLog() || g_dnssecmode == DNSSECMode::ValidateForLog) { -- L<<Logger::Warning<<"Answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<" validates as Bogus"<<endl; -+ g_log<<Logger::Warning<<"Answer to "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" for "<<dc->d_remote.toStringWithPort()<<" validates as Bogus"<<endl; - } - - // Does the query or validation mode sending out a SERVFAIL on validation errors? - if(!pw.getHeader()->cd && (g_dnssecmode == DNSSECMode::ValidateAll || dc->d_mdp.d_header.ad || DNSSECOK)) { - if(sr.doLog()) { -- L<<Logger::Warning<<"Sending out SERVFAIL for "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" because recursor or query demands it for Bogus results"<<endl; -+ g_log<<Logger::Warning<<"Sending out SERVFAIL for "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" because recursor or query demands it for Bogus results"<<endl; - } - - pw.getHeader()->rcode=RCode::ServFail; - goto sendit; - } else { - if(sr.doLog()) { -- L<<Logger::Warning<<"Not sending out SERVFAIL for "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" Bogus validation since neither config nor query demands this"<<endl; -+ g_log<<Logger::Warning<<"Not sending out SERVFAIL for "<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<" Bogus validation since neither config nor query demands this"<<endl; - } - } - } - } - catch(ImmediateServFailException &e) { - if(g_logCommonErrors) -- L<<Logger::Notice<<"Sending SERVFAIL to "<<dc->getRemote()<<" during validation of '"<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<"' because: "<<e.reason<<endl; -+ g_log<<Logger::Notice<<"Sending SERVFAIL to "<<dc->getRemote()<<" during validation of '"<<dc->d_mdp.d_qname<<"|"<<QType(dc->d_mdp.d_qtype).getName()<<"' because: "<<e.reason<<endl; - pw.getHeader()->rcode=RCode::ServFail; - goto sendit; - } -@@ -1132,7 +1132,7 @@ void startDoResolve(void *p) - addCMsgSrcAddr(&msgh, cbuf, &dc->d_local, 0); - } - if(sendmsg(dc->d_socket, &msgh, 0) < 0 && g_logCommonErrors) -- L<<Logger::Warning<<"Sending UDP reply to client "<<dc->d_remote.toStringWithPort()<<" failed with: "<<strerror(errno)<<endl; -+ g_log<<Logger::Warning<<"Sending UDP reply to client "<<dc->d_remote.toStringWithPort()<<" failed with: "<<strerror(errno)<<endl; - if(!SyncRes::s_nopacketcache && !variableAnswer && !sr.wasVariable() ) { - t_packetCache->insertResponsePacket(dc->d_tag, dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_mdp.d_qclass, dc->d_query, - string((const char*)&*packet.begin(), packet.size()), -@@ -1157,11 +1157,11 @@ void startDoResolve(void *p) - bool hadError=true; - - if(wret == 0) -- L<<Logger::Error<<"EOF writing TCP answer to "<<dc->getRemote()<<endl; -+ g_log<<Logger::Error<<"EOF writing TCP answer to "<<dc->getRemote()<<endl; - else if(wret < 0 ) -- L<<Logger::Error<<"Error writing TCP answer to "<<dc->getRemote()<<": "<< strerror(errno) <<endl; -+ g_log<<Logger::Error<<"Error writing TCP answer to "<<dc->getRemote()<<": "<< strerror(errno) <<endl; - else if((unsigned int)wret != 2 + packet.size()) -- L<<Logger::Error<<"Oops, partial answer sent to "<<dc->getRemote()<<" for "<<dc->d_mdp.d_qname<<" (size="<< (2 + packet.size()) <<", sent "<<wret<<")"<<endl; -+ g_log<<Logger::Error<<"Oops, partial answer sent to "<<dc->getRemote()<<" for "<<dc->d_mdp.d_qname<<" (size="<< (2 + packet.size()) <<", sent "<<wret<<")"<<endl; - else - hadError=false; - -@@ -1180,8 +1180,8 @@ void startDoResolve(void *p) - } - - if(!g_quiet) { -- L<<Logger::Error<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] answer to "<<(dc->d_mdp.d_header.rd?"":"non-rd ")<<"question '"<<dc->d_mdp.d_qname<<"|"<<DNSRecordContent::NumberToType(dc->d_mdp.d_qtype); -- L<<"': "<<ntohs(pw.getHeader()->ancount)<<" answers, "<<ntohs(pw.getHeader()->arcount)<<" additional, took "<<sr.d_outqueries<<" packets, "<< -+ g_log<<Logger::Error<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] answer to "<<(dc->d_mdp.d_header.rd?"":"non-rd ")<<"question '"<<dc->d_mdp.d_qname<<"|"<<DNSRecordContent::NumberToType(dc->d_mdp.d_qtype); -+ g_log<<"': "<<ntohs(pw.getHeader()->ancount)<<" answers, "<<ntohs(pw.getHeader()->arcount)<<" additional, took "<<sr.d_outqueries<<" packets, "<< - sr.d_totUsec/1000.0<<" ms, "<< - sr.d_throttledqueries<<" throttled, "<<sr.d_timeouts<<" timeouts, "<<sr.d_tcpoutqueries<<" tcp connections, rcode="<<res<<endl; - } -@@ -1208,28 +1208,28 @@ void startDoResolve(void *p) - dc=0; - } - catch(PDNSException &ae) { -- L<<Logger::Error<<"startDoResolve problem "<<makeLoginfo(dc)<<": "<<ae.reason<<endl; -+ g_log<<Logger::Error<<"startDoResolve problem "<<makeLoginfo(dc)<<": "<<ae.reason<<endl; - delete dc; - } - catch(MOADNSException& e) { -- L<<Logger::Error<<"DNS parser error "<<makeLoginfo(dc) <<": "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl; -+ g_log<<Logger::Error<<"DNS parser error "<<makeLoginfo(dc) <<": "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl; - delete dc; - } - catch(std::exception& e) { -- L<<Logger::Error<<"STL error "<< makeLoginfo(dc)<<": "<<e.what(); -+ g_log<<Logger::Error<<"STL error "<< makeLoginfo(dc)<<": "<<e.what(); - - // Luawrapper nests the exception from Lua, so we unnest it here - try { - std::rethrow_if_nested(e); - } catch(const std::exception& e) { -- L<<". Extra info: "<<e.what(); -+ g_log<<". Extra info: "<<e.what(); - } catch(...) {} - -- L<<endl; -+ g_log<<endl; - delete dc; - } - catch(...) { -- L<<Logger::Error<<"Any other exception in a resolver context "<< makeLoginfo(dc) <<endl; -+ g_log<<Logger::Error<<"Any other exception in a resolver context "<< makeLoginfo(dc) <<endl; - } - - g_stats.maxMThreadStackUsage = max(MT->getMaxStackUsage(), g_stats.maxMThreadStackUsage); -@@ -1322,7 +1322,7 @@ void handleRunningTCPQuestion(int fd, FD - } - if(!bytes || bytes < 0) { - if(g_logCommonErrors) -- L<<Logger::Error<<"TCP client "<< conn->d_remote.toString() <<" disconnected after first byte"<<endl; -+ g_log<<Logger::Error<<"TCP client "<< conn->d_remote.toString() <<" disconnected after first byte"<<endl; - t_fdm->removeReadFD(fd); - return; - } -@@ -1330,7 +1330,7 @@ void handleRunningTCPQuestion(int fd, FD - else if(conn->state==TCPConnection::GETQUESTION) { - ssize_t bytes=recv(conn->getFD(), conn->data + conn->bytesread, conn->qlen - conn->bytesread, 0); - if(!bytes || bytes < 0 || bytes > std::numeric_limits<std::uint16_t>::max()) { -- L<<Logger::Error<<"TCP client "<< conn->d_remote.toString() <<" disconnected while reading question body"<<endl; -+ g_log<<Logger::Error<<"TCP client "<< conn->d_remote.toString() <<" disconnected while reading question body"<<endl; - t_fdm->removeReadFD(fd); - return; - } -@@ -1345,7 +1345,7 @@ void handleRunningTCPQuestion(int fd, FD - catch(MOADNSException &mde) { - g_stats.clientParseError++; - if(g_logCommonErrors) -- L<<Logger::Error<<"Unable to parse packet from TCP client "<< conn->d_remote.toString() <<endl; -+ g_log<<Logger::Error<<"Unable to parse packet from TCP client "<< conn->d_remote.toString() <<endl; - return; - } - dc->d_tcpConnection = conn; // carry the torch -@@ -1381,14 +1381,14 @@ void handleRunningTCPQuestion(int fd, FD - } - catch(std::exception& e) { - if(g_logCommonErrors) -- L<<Logger::Warning<<"Error parsing a query packet qname='"<<qname<<"' for tag determination, setting tag=0: "<<e.what()<<endl; -+ g_log<<Logger::Warning<<"Error parsing a query packet qname='"<<qname<<"' for tag determination, setting tag=0: "<<e.what()<<endl; - } - } - } - catch(std::exception& e) - { - if(g_logCommonErrors) -- L<<Logger::Warning<<"Error parsing a query packet for tag determination, setting tag=0: "<<e.what()<<endl; -+ g_log<<Logger::Warning<<"Error parsing a query packet for tag determination, setting tag=0: "<<e.what()<<endl; - } - } - #ifdef HAVE_PROTOBUF -@@ -1404,20 +1404,20 @@ void handleRunningTCPQuestion(int fd, FD - } - catch(std::exception& e) { - if(g_logCommonErrors) -- L<<Logger::Warning<<"Error parsing a TCP query packet for edns subnet: "<<e.what()<<endl; -+ g_log<<Logger::Warning<<"Error parsing a TCP query packet for edns subnet: "<<e.what()<<endl; - } - } - #endif - if(dc->d_mdp.d_header.qr) { - delete dc; - g_stats.ignoredCount++; -- L<<Logger::Error<<"Ignoring answer from TCP client "<< conn->d_remote.toString() <<" on server socket!"<<endl; -+ g_log<<Logger::Error<<"Ignoring answer from TCP client "<< conn->d_remote.toString() <<" on server socket!"<<endl; - return; - } - if(dc->d_mdp.d_header.opcode) { - delete dc; - g_stats.ignoredCount++; -- L<<Logger::Error<<"Ignoring non-query opcode from TCP client "<< conn->d_remote.toString() <<" on server socket!"<<endl; -+ g_log<<Logger::Error<<"Ignoring non-query opcode from TCP client "<< conn->d_remote.toString() <<" on server socket!"<<endl; - return; - } - else { -@@ -1443,7 +1443,7 @@ void handleNewTCPQuestion(int fd, FDMult - closesocket(newsock); - } - catch(const PDNSException& e) { -- L<<Logger::Error<<"Error closing TCP socket after an over capacity drop: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error closing TCP socket after an over capacity drop: "<<e.reason<<endl; - } - return; - } -@@ -1452,14 +1452,14 @@ void handleNewTCPQuestion(int fd, FDMult - t_remotes->push_back(addr); - if(t_allowFrom && !t_allowFrom->match(&addr)) { - if(!g_quiet) -- L<<Logger::Error<<"["<<MT->getTid()<<"] dropping TCP query from "<<addr.toString()<<", address not matched by allow-from"<<endl; -+ g_log<<Logger::Error<<"["<<MT->getTid()<<"] dropping TCP query from "<<addr.toString()<<", address not matched by allow-from"<<endl; - - g_stats.unauthorizedTCP++; - try { - closesocket(newsock); - } - catch(const PDNSException& e) { -- L<<Logger::Error<<"Error closing TCP socket after an ACL drop: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error closing TCP socket after an ACL drop: "<<e.reason<<endl; - } - return; - } -@@ -1469,7 +1469,7 @@ void handleNewTCPQuestion(int fd, FDMult - closesocket(newsock); // don't call TCPConnection::closeAndCleanup here - did not enter it in the counts yet! - } - catch(const PDNSException& e) { -- L<<Logger::Error<<"Error closing TCP socket after an overflow drop: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error closing TCP socket after an overflow drop: "<<e.reason<<endl; - } - return; - } -@@ -1547,14 +1547,14 @@ string* doProcessUDPQuestion(const std:: - } - catch(std::exception& e) { - if(g_logCommonErrors) -- L<<Logger::Warning<<"Error parsing a query packet qname='"<<qname<<"' for tag determination, setting tag=0: "<<e.what()<<endl; -+ g_log<<Logger::Warning<<"Error parsing a query packet qname='"<<qname<<"' for tag determination, setting tag=0: "<<e.what()<<endl; - } - } - } - catch(std::exception& e) - { - if(g_logCommonErrors) -- L<<Logger::Warning<<"Error parsing a query packet for tag determination, setting tag=0: "<<e.what()<<endl; -+ g_log<<Logger::Warning<<"Error parsing a query packet for tag determination, setting tag=0: "<<e.what()<<endl; - } - } - -@@ -1579,7 +1579,7 @@ string* doProcessUDPQuestion(const std:: - } - #endif /* HAVE_PROTOBUF */ - if(!g_quiet) -- L<<Logger::Notice<<t_id<< " question answered from packet cache tag="<<ctag<<" from "<<fromaddr.toString()<<endl; -+ g_log<<Logger::Notice<<t_id<< " question answered from packet cache tag="<<ctag<<" from "<<fromaddr.toString()<<endl; - - g_stats.packetCacheHits++; - SyncRes::s_queries++; -@@ -1594,7 +1594,7 @@ string* doProcessUDPQuestion(const std:: - addCMsgSrcAddr(&msgh, cbuf, &destaddr, 0); - } - if(sendmsg(fd, &msgh, 0) < 0 && g_logCommonErrors) -- L<<Logger::Warning<<"Sending UDP reply to client "<<fromaddr.toStringWithPort()<<" failed with: "<<strerror(errno)<<endl; -+ g_log<<Logger::Warning<<"Sending UDP reply to client "<<fromaddr.toStringWithPort()<<" failed with: "<<strerror(errno)<<endl; - - if(response.length() >= sizeof(struct dnsheader)) { - struct dnsheader tmpdh; -@@ -1606,14 +1606,14 @@ string* doProcessUDPQuestion(const std:: - } - } - catch(std::exception& e) { -- L<<Logger::Error<<"Error processing or aging answer packet: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Error processing or aging answer packet: "<<e.what()<<endl; - return 0; - } - - if(t_pdl->get()) { - if((*t_pdl)->ipfilter(fromaddr, destaddr, *dh)) { - if(!g_quiet) -- L<<Logger::Notice<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] DROPPED question from "<<fromaddr.toStringWithPort()<<" based on policy"<<endl; -+ g_log<<Logger::Notice<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] DROPPED question from "<<fromaddr.toStringWithPort()<<" based on policy"<<endl; - g_stats.policyDrops++; - return 0; - } -@@ -1621,7 +1621,7 @@ string* doProcessUDPQuestion(const std:: - - if(MT->numProcesses() > g_maxMThreads) { - if(!g_quiet) -- L<<Logger::Notice<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] DROPPED question from "<<fromaddr.toStringWithPort()<<", over capacity"<<endl; -+ g_log<<Logger::Notice<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] DROPPED question from "<<fromaddr.toStringWithPort()<<", over capacity"<<endl; - - g_stats.overCapacityDrops++; - return 0; -@@ -1672,7 +1672,7 @@ void handleNewUDPQuestion(int fd, FDMult - - if(t_allowFrom && !t_allowFrom->match(&fromaddr)) { - if(!g_quiet) -- L<<Logger::Error<<"["<<MT->getTid()<<"] dropping UDP query from "<<fromaddr.toString()<<", address not matched by allow-from"<<endl; -+ g_log<<Logger::Error<<"["<<MT->getTid()<<"] dropping UDP query from "<<fromaddr.toString()<<", address not matched by allow-from"<<endl; - - g_stats.unauthorizedUDP++; - return; -@@ -1680,7 +1680,7 @@ void handleNewUDPQuestion(int fd, FDMult - BOOST_STATIC_ASSERT(offsetof(sockaddr_in, sin_port) == offsetof(sockaddr_in6, sin6_port)); - if(!fromaddr.sin4.sin_port) { // also works for IPv6 - if(!g_quiet) -- L<<Logger::Error<<"["<<MT->getTid()<<"] dropping UDP query from "<<fromaddr.toStringWithPort()<<", can't deal with port 0"<<endl; -+ g_log<<Logger::Error<<"["<<MT->getTid()<<"] dropping UDP query from "<<fromaddr.toStringWithPort()<<", can't deal with port 0"<<endl; - - g_stats.clientParseError++; // not quite the best place to put it, but needs to go somewhere - return; -@@ -1691,12 +1691,12 @@ void handleNewUDPQuestion(int fd, FDMult - if(dh->qr) { - g_stats.ignoredCount++; - if(g_logCommonErrors) -- L<<Logger::Error<<"Ignoring answer from "<<fromaddr.toString()<<" on server socket!"<<endl; -+ g_log<<Logger::Error<<"Ignoring answer from "<<fromaddr.toString()<<" on server socket!"<<endl; - } - else if(dh->opcode) { - g_stats.ignoredCount++; - if(g_logCommonErrors) -- L<<Logger::Error<<"Ignoring non-query opcode "<<dh->opcode<<" from "<<fromaddr.toString()<<" on server socket!"<<endl; -+ g_log<<Logger::Error<<"Ignoring non-query opcode "<<dh->opcode<<" from "<<fromaddr.toString()<<" on server socket!"<<endl; - } - else { - string question(data, (size_t)len); -@@ -1729,12 +1729,12 @@ void handleNewUDPQuestion(int fd, FDMult - catch(MOADNSException& mde) { - g_stats.clientParseError++; - if(g_logCommonErrors) -- L<<Logger::Error<<"Unable to parse packet from remote UDP client "<<fromaddr.toString() <<": "<<mde.what()<<endl; -+ g_log<<Logger::Error<<"Unable to parse packet from remote UDP client "<<fromaddr.toString() <<": "<<mde.what()<<endl; - } - catch(std::runtime_error& e) { - g_stats.clientParseError++; - if(g_logCommonErrors) -- L<<Logger::Error<<"Unable to parse packet from remote UDP client "<<fromaddr.toString() <<": "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Unable to parse packet from remote UDP client "<<fromaddr.toString() <<": "<<e.what()<<endl; - } - } - else { -@@ -1782,17 +1782,17 @@ void makeTCPServerSockets() - - int tmp=1; - if(setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,(char*)&tmp,sizeof tmp)<0) { -- L<<Logger::Error<<"Setsockopt failed for TCP listening socket"<<endl; -+ g_log<<Logger::Error<<"Setsockopt failed for TCP listening socket"<<endl; - exit(1); - } - if(sin.sin6.sin6_family == AF_INET6 && setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &tmp, sizeof(tmp)) < 0) { -- L<<Logger::Error<<"Failed to set IPv6 socket to IPv6 only, continuing anyhow: "<<strerror(errno)<<endl; -+ g_log<<Logger::Error<<"Failed to set IPv6 socket to IPv6 only, continuing anyhow: "<<strerror(errno)<<endl; - } - - #ifdef TCP_DEFER_ACCEPT - if(setsockopt(fd, SOL_TCP,TCP_DEFER_ACCEPT,(char*)&tmp,sizeof tmp) >= 0) { - if(i==locals.begin()) -- L<<Logger::Error<<"Enabled TCP data-ready filter for (slight) DoS protection"<<endl; -+ g_log<<Logger::Error<<"Enabled TCP data-ready filter for (slight) DoS protection"<<endl; - } - #endif - -@@ -1820,9 +1820,9 @@ void makeTCPServerSockets() - // we don't need to update g_listenSocketsAddresses since it doesn't work for TCP/IP: - // - fd is not that which we know here, but returned from accept() - if(sin.sin4.sin_family == AF_INET) -- L<<Logger::Error<<"Listening for TCP queries on "<< sin.toString() <<":"<<st.port<<endl; -+ g_log<<Logger::Error<<"Listening for TCP queries on "<< sin.toString() <<":"<<st.port<<endl; - else -- L<<Logger::Error<<"Listening for TCP queries on ["<< sin.toString() <<"]:"<<st.port<<endl; -+ g_log<<Logger::Error<<"Listening for TCP queries on ["<< sin.toString() <<"]:"<<st.port<<endl; - } - } - -@@ -1855,7 +1855,7 @@ void makeUDPServerSockets() - throw PDNSException("Making a UDP server socket for resolver: "+netstringerror()); - } - if (!setSocketTimestamps(fd)) -- L<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl; -+ g_log<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl; - - if(IsAnyAddress(sin)) { - if(sin.sin4.sin_family == AF_INET) -@@ -1867,7 +1867,7 @@ void makeUDPServerSockets() - g_fromtosockets.insert(fd); - #endif - if(sin.sin6.sin6_family == AF_INET6 && setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0) { -- L<<Logger::Error<<"Failed to set IPv6 socket to IPv6 only, continuing anyhow: "<<strerror(errno)<<endl; -+ g_log<<Logger::Error<<"Failed to set IPv6 socket to IPv6 only, continuing anyhow: "<<strerror(errno)<<endl; - } - } - if( ::arg().mustDo("non-local-bind") ) -@@ -1894,9 +1894,9 @@ void makeUDPServerSockets() - deferredAdd.push_back(make_pair(fd, handleNewUDPQuestion)); - g_listenSocketsAddresses[fd]=sin; // this is written to only from the startup thread, not from the workers - if(sin.sin4.sin_family == AF_INET) -- L<<Logger::Error<<"Listening for UDP queries on "<< sin.toString() <<":"<<st.port<<endl; -+ g_log<<Logger::Error<<"Listening for UDP queries on "<< sin.toString() <<":"<<st.port<<endl; - else -- L<<Logger::Error<<"Listening for UDP queries on ["<< sin.toString() <<"]:"<<st.port<<endl; -+ g_log<<Logger::Error<<"Listening for UDP queries on ["<< sin.toString() <<"]:"<<st.port<<endl; - } - } - -@@ -1910,7 +1910,7 @@ void daemonize(void) - - int i=open("/dev/null",O_RDWR); /* open stdin */ - if(i < 0) -- L<<Logger::Critical<<"Unable to open /dev/null: "<<stringerror()<<endl; -+ g_log<<Logger::Critical<<"Unable to open /dev/null: "<<stringerror()<<endl; - else { - dup2(i,0); /* stdin */ - dup2(i,1); /* stderr */ -@@ -1943,35 +1943,35 @@ void doStats(void) - uint64_t cacheMisses = broadcastAccFunction<uint64_t>(pleaseGetCacheMisses); - - if(g_stats.qcounter && (cacheHits + cacheMisses) && SyncRes::s_queries && SyncRes::s_outqueries) { -- L<<Logger::Notice<<"stats: "<<g_stats.qcounter<<" questions, "<< -+ g_log<<Logger::Notice<<"stats: "<<g_stats.qcounter<<" questions, "<< - broadcastAccFunction<uint64_t>(pleaseGetCacheSize)<< " cache entries, "<< - broadcastAccFunction<uint64_t>(pleaseGetNegCacheSize)<<" negative entries, "<< - (int)((cacheHits*100.0)/(cacheHits+cacheMisses))<<"% cache hits"<<endl; - -- L<<Logger::Notice<<"stats: throttle map: " -+ g_log<<Logger::Notice<<"stats: throttle map: " - << broadcastAccFunction<uint64_t>(pleaseGetThrottleSize) <<", ns speeds: " - << broadcastAccFunction<uint64_t>(pleaseGetNsSpeedsSize)<<endl; -- L<<Logger::Notice<<"stats: outpacket/query ratio "<<(int)(SyncRes::s_outqueries*100.0/SyncRes::s_queries)<<"%"; -- L<<Logger::Notice<<", "<<(int)(SyncRes::s_throttledqueries*100.0/(SyncRes::s_outqueries+SyncRes::s_throttledqueries))<<"% throttled, " -+ g_log<<Logger::Notice<<"stats: outpacket/query ratio "<<(int)(SyncRes::s_outqueries*100.0/SyncRes::s_queries)<<"%"; -+ g_log<<Logger::Notice<<", "<<(int)(SyncRes::s_throttledqueries*100.0/(SyncRes::s_outqueries+SyncRes::s_throttledqueries))<<"% throttled, " - <<SyncRes::s_nodelegated<<" no-delegation drops"<<endl; -- L<<Logger::Notice<<"stats: "<<SyncRes::s_tcpoutqueries<<" outgoing tcp connections, "<< -+ g_log<<Logger::Notice<<"stats: "<<SyncRes::s_tcpoutqueries<<" outgoing tcp connections, "<< - broadcastAccFunction<uint64_t>(pleaseGetConcurrentQueries)<<" queries running, "<<SyncRes::s_outgoingtimeouts<<" outgoing timeouts"<<endl; - -- //L<<Logger::Notice<<"stats: "<<g_stats.ednsPingMatches<<" ping matches, "<<g_stats.ednsPingMismatches<<" mismatches, "<< -+ //g_log<<Logger::Notice<<"stats: "<<g_stats.ednsPingMatches<<" ping matches, "<<g_stats.ednsPingMismatches<<" mismatches, "<< - //g_stats.noPingOutQueries<<" outqueries w/o ping, "<< g_stats.noEdnsOutQueries<<" w/o EDNS"<<endl; - -- L<<Logger::Notice<<"stats: " << broadcastAccFunction<uint64_t>(pleaseGetPacketCacheSize) << -+ g_log<<Logger::Notice<<"stats: " << broadcastAccFunction<uint64_t>(pleaseGetPacketCacheSize) << - " packet cache entries, "<<(int)(100.0*broadcastAccFunction<uint64_t>(pleaseGetPacketCacheHits)/SyncRes::s_queries) << "% packet cache hits"<<endl; - - time_t now = time(0); - if(lastOutputTime && lastQueryCount && now != lastOutputTime) { -- L<<Logger::Notice<<"stats: "<< (SyncRes::s_queries - lastQueryCount) / (now - lastOutputTime) <<" qps (average over "<< (now - lastOutputTime) << " seconds)"<<endl; -+ g_log<<Logger::Notice<<"stats: "<< (SyncRes::s_queries - lastQueryCount) / (now - lastOutputTime) <<" qps (average over "<< (now - lastOutputTime) << " seconds)"<<endl; - } - lastOutputTime = now; - lastQueryCount = SyncRes::s_queries; - } - else if(statsWanted) -- L<<Logger::Notice<<"stats: no stats yet!"<<endl; -+ g_log<<Logger::Notice<<"stats: no stats yet!"<<endl; - - statsWanted=false; - } -@@ -2026,15 +2026,15 @@ static void houseKeeping(void *) - } - catch(std::exception& e) - { -- L<<Logger::Error<<"Exception while performing security poll: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Exception while performing security poll: "<<e.what()<<endl; - } - catch(PDNSException& e) - { -- L<<Logger::Error<<"Exception while performing security poll: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Exception while performing security poll: "<<e.reason<<endl; - } - catch(...) - { -- L<<Logger::Error<<"Exception while performing security poll"<<endl; -+ g_log<<Logger::Error<<"Exception while performing security poll"<<endl; - } - - } -@@ -2044,7 +2044,7 @@ static void houseKeeping(void *) - catch(PDNSException& ae) - { - s_running=false; -- L<<Logger::Error<<"Fatal error in housekeeping thread: "<<ae.reason<<endl; -+ g_log<<Logger::Error<<"Fatal error in housekeeping thread: "<<ae.reason<<endl; - throw; - } - } -@@ -2140,11 +2140,11 @@ void handlePipeRequest(int fd, FDMultipl - } - catch(std::exception& e) { - if(g_logCommonErrors) -- L<<Logger::Error<<"PIPE function we executed created exception: "<<e.what()<<endl; // but what if they wanted an answer.. we send 0 -+ g_log<<Logger::Error<<"PIPE function we executed created exception: "<<e.what()<<endl; // but what if they wanted an answer.. we send 0 - } - catch(PDNSException& e) { - if(g_logCommonErrors) -- L<<Logger::Error<<"PIPE function we executed created PDNS exception: "<<e.reason<<endl; // but what if they wanted an answer.. we send 0 -+ g_log<<Logger::Error<<"PIPE function we executed created PDNS exception: "<<e.reason<<endl; // but what if they wanted an answer.. we send 0 - } - if(tmsg->wantAnswer) { - if(write(g_pipes[t_id].writeFromThread, &resp, sizeof(resp)) != sizeof(resp)) { -@@ -2245,10 +2245,10 @@ void handleRCC(int fd, FDMultiplexer::fu - command(); - } - catch(std::exception& e) { -- L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl; - } - catch(PDNSException& ae) { -- L<<Logger::Error<<"Error dealing with control socket request: "<<ae.reason<<endl; -+ g_log<<Logger::Error<<"Error dealing with control socket request: "<<ae.reason<<endl; - } - } - -@@ -2335,7 +2335,7 @@ void handleUDPServerResponse(int fd, FDM - else { - g_stats.serverParseError++; - if(g_logCommonErrors) -- L<<Logger::Error<<"Unable to parse packet from remote UDP server "<< fromaddr.toString() << -+ g_log<<Logger::Error<<"Unable to parse packet from remote UDP server "<< fromaddr.toString() << - ": packet smaller than DNS header"<<endl; - } - -@@ -2359,7 +2359,7 @@ void handleUDPServerResponse(int fd, FDM - pident.fd=fd; - - if(!dh.qr && g_logCommonErrors) { -- L<<Logger::Notice<<"Not taking data from question on outgoing socket from "<< fromaddr.toStringWithPort() <<endl; -+ g_log<<Logger::Notice<<"Not taking data from question on outgoing socket from "<< fromaddr.toStringWithPort() <<endl; - } - - if(!dh.qdcount || // UPC, Nominum, very old BIND on FormErr, NSD -@@ -2374,7 +2374,7 @@ void handleUDPServerResponse(int fd, FDM - } - catch(std::exception& e) { - g_stats.serverParseError++; // won't be fed to lwres.cc, so we have to increment -- L<<Logger::Warning<<"Error in packet from remote nameserver "<< fromaddr.toStringWithPort() << ": "<<e.what() << endl; -+ g_log<<Logger::Warning<<"Error in packet from remote nameserver "<< fromaddr.toStringWithPort() << ": "<<e.what() << endl; - return; - } - } -@@ -2407,7 +2407,7 @@ retryWithName: - } - g_stats.unexpectedCount++; // if we made it here, it really is an unexpected answer - if(g_logCommonErrors) { -- L<<Logger::Warning<<"Discarding unexpected packet from "<<fromaddr.toStringWithPort()<<": "<< (pident.domain.empty() ? "<empty>" : pident.domain.toString())<<", "<<pident.type<<", "<<MT->d_waiters.size()<<" waiters"<<endl; -+ g_log<<Logger::Warning<<"Discarding unexpected packet from "<<fromaddr.toStringWithPort()<<": "<< (pident.domain.empty() ? "<empty>" : pident.domain.toString())<<", "<<pident.type<<", "<<MT->d_waiters.size()<<" waiters"<<endl; - } - } - else if(fd >= 0) { -@@ -2425,13 +2425,13 @@ FDMultiplexer* getMultiplexer() - return ret; - } - catch(FDMultiplexerException &fe) { -- L<<Logger::Error<<"Non-fatal error initializing possible multiplexer ("<<fe.what()<<"), falling back"<<endl; -+ g_log<<Logger::Error<<"Non-fatal error initializing possible multiplexer ("<<fe.what()<<"), falling back"<<endl; - } - catch(...) { -- L<<Logger::Error<<"Non-fatal error initializing possible multiplexer"<<endl; -+ g_log<<Logger::Error<<"Non-fatal error initializing possible multiplexer"<<endl; - } - } -- L<<Logger::Error<<"No working multiplexer found!"<<endl; -+ g_log<<Logger::Error<<"No working multiplexer found!"<<endl; - exit(1); - } - -@@ -2442,7 +2442,7 @@ string* doReloadLuaScript() - try { - if(fname.empty()) { - t_pdl->reset(); -- L<<Logger::Error<<t_id<<" Unloaded current lua script"<<endl; -+ g_log<<Logger::Error<<t_id<<" Unloaded current lua script"<<endl; - return new string("unloaded\n"); - } - else { -@@ -2450,11 +2450,11 @@ string* doReloadLuaScript() - } - } - catch(std::exception& e) { -- L<<Logger::Error<<t_id<<" Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl; -+ g_log<<Logger::Error<<t_id<<" Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl; - return new string("retaining current script, error from '"+fname+"': "+e.what()+"\n"); - } - -- L<<Logger::Warning<<t_id<<" (Re)loaded lua script from '"<<fname<<"'"<<endl; -+ g_log<<Logger::Warning<<t_id<<" (Re)loaded lua script from '"<<fname<<"'"<<endl; - return new string("(re)loaded '"+fname+"'\n"); - } - -@@ -2495,7 +2495,7 @@ static void checkLinuxIPv6Limits() - if(readFileIfThere("/proc/sys/net/ipv6/route/max_size", &line)) { - int lim=std::stoi(line); - if(lim < 16384) { -- L<<Logger::Error<<"If using IPv6, please raise sysctl net.ipv6.route.max_size, currently set to "<<lim<<" which is < 16384"<<endl; -+ g_log<<Logger::Error<<"If using IPv6, please raise sysctl net.ipv6.route.max_size, currently set to "<<lim<<" which is < 16384"<<endl; - } - } - #endif -@@ -2509,11 +2509,11 @@ static void checkOrFixFDS() - unsigned int hardlimit= getFilenumLimit(true); - if(hardlimit >= wantFDs) { - setFilenumLimit(wantFDs); -- L<<Logger::Warning<<"Raised soft limit on number of filedescriptors to "<<wantFDs<<" to match max-mthreads and threads settings"<<endl; -+ g_log<<Logger::Warning<<"Raised soft limit on number of filedescriptors to "<<wantFDs<<" to match max-mthreads and threads settings"<<endl; - } - else { - int newval = (hardlimit - 25) / g_numWorkerThreads; -- L<<Logger::Warning<<"Insufficient number of filedescriptors available for max-mthreads*threads setting! ("<<hardlimit<<" < "<<wantFDs<<"), reducing max-mthreads to "<<newval<<endl; -+ g_log<<Logger::Warning<<"Insufficient number of filedescriptors available for max-mthreads*threads setting! ("<<hardlimit<<" < "<<wantFDs<<"), reducing max-mthreads to "<<newval<<endl; - g_maxMThreads = newval; - setFilenumLimit(hardlimit); - } -@@ -2584,24 +2584,24 @@ void parseACLs() - - allowFrom->addMask(line); - } -- L<<Logger::Warning<<"Done parsing " << allowFrom->size() <<" allow-from ranges from file '"<<::arg()["allow-from-file"]<<"' - overriding 'allow-from' setting"<<endl; -+ g_log<<Logger::Warning<<"Done parsing " << allowFrom->size() <<" allow-from ranges from file '"<<::arg()["allow-from-file"]<<"' - overriding 'allow-from' setting"<<endl; - } - else if(!::arg()["allow-from"].empty()) { - vector<string> ips; - stringtok(ips, ::arg()["allow-from"], ", "); - -- L<<Logger::Warning<<"Only allowing queries from: "; -+ g_log<<Logger::Warning<<"Only allowing queries from: "; - for(vector<string>::const_iterator i = ips.begin(); i!= ips.end(); ++i) { - allowFrom->addMask(*i); - if(i!=ips.begin()) -- L<<Logger::Warning<<", "; -- L<<Logger::Warning<<*i; -+ g_log<<Logger::Warning<<", "; -+ g_log<<Logger::Warning<<*i; - } -- L<<Logger::Warning<<endl; -+ g_log<<Logger::Warning<<endl; - } - else { - if(::arg()["local-address"]!="127.0.0.1" && ::arg().asNum("local-port")==53) -- L<<Logger::Error<<"WARNING: Allowing queries from all IP addresses - this can be a security risk!"<<endl; -+ g_log<<Logger::Error<<"WARNING: Allowing queries from all IP addresses - this can be a security risk!"<<endl; - delete allowFrom; - allowFrom = 0; - } -@@ -2626,16 +2626,16 @@ static void setupDelegationOnly() - - int serviceMain(int argc, char*argv[]) - { -- L.setName(s_programname); -- L.setLoglevel((Logger::Urgency)(6)); // info and up -- L.disableSyslog(::arg().mustDo("disable-syslog")); -+ g_log.setName(s_programname); -+ g_log.setLoglevel((Logger::Urgency)(6)); // info and up -+ g_log.disableSyslog(::arg().mustDo("disable-syslog")); - - if(!::arg()["logging-facility"].empty()) { - int val=logFacilityToLOG(::arg().asNum("logging-facility") ); - if(val >= 0) -- theL().setFacility(val); -+ g_log.setFacility(val); - else -- L<<Logger::Error<<"Unknown logging facility "<<::arg().asNum("logging-facility") <<endl; -+ g_log<<Logger::Error<<"Unknown logging facility "<<::arg().asNum("logging-facility") <<endl; - } - - showProductVersion(); -@@ -2648,7 +2648,7 @@ int serviceMain(int argc, char*argv[]) - vector<string> addrs; - if(!::arg()["query-local-address6"].empty()) { - SyncRes::s_doIPv6=true; -- L<<Logger::Warning<<"Enabling IPv6 transport for outgoing queries"<<endl; -+ g_log<<Logger::Warning<<"Enabling IPv6 transport for outgoing queries"<<endl; - - stringtok(addrs, ::arg()["query-local-address6"], ", ;"); - for(const string& addr : addrs) { -@@ -2656,7 +2656,7 @@ int serviceMain(int argc, char*argv[]) - } - } - else { -- L<<Logger::Warning<<"NOT using IPv6 for outgoing queries - set 'query-local-address6=::' to enable"<<endl; -+ g_log<<Logger::Warning<<"NOT using IPv6 for outgoing queries - set 'query-local-address6=::' to enable"<<endl; - } - addrs.clear(); - stringtok(addrs, ::arg()["query-local-address"], ", ;"); -@@ -2665,7 +2665,7 @@ int serviceMain(int argc, char*argv[]) - } - } - catch(std::exception& e) { -- L<<Logger::Error<<"Assigning local query addresses: "<<e.what(); -+ g_log<<Logger::Error<<"Assigning local query addresses: "<<e.what(); - exit(99); - } - -@@ -2681,7 +2681,7 @@ int serviceMain(int argc, char*argv[]) - else if(::arg()["dnssec"]=="log-fail") - g_dnssecmode=DNSSECMode::ValidateForLog; - else { -- L<<Logger::Error<<"Unknown DNSSEC mode "<<::arg()["dnssec"]<<endl; -+ g_log<<Logger::Error<<"Unknown DNSSEC mode "<<::arg()["dnssec"]<<endl; - exit(1); - } - -@@ -2691,7 +2691,7 @@ int serviceMain(int argc, char*argv[]) - loadRecursorLuaConfig(::arg()["lua-config-file"], ::arg().mustDo("daemon")); - } - catch (PDNSException &e) { -- L<<Logger::Error<<"Cannot load Lua configuration: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Cannot load Lua configuration: "<<e.reason<<endl; - exit(1); - } - -@@ -2705,21 +2705,21 @@ int serviceMain(int argc, char*argv[]) - ips.push_back("0.0.0.0"); - ips.push_back("::"); - -- L<<Logger::Warning<<"Will not send queries to: "; -+ g_log<<Logger::Warning<<"Will not send queries to: "; - for(vector<string>::const_iterator i = ips.begin(); i!= ips.end(); ++i) { - g_dontQuery->addMask(*i); - if(i!=ips.begin()) -- L<<Logger::Warning<<", "; -- L<<Logger::Warning<<*i; -+ g_log<<Logger::Warning<<", "; -+ g_log<<Logger::Warning<<*i; - } -- L<<Logger::Warning<<endl; -+ g_log<<Logger::Warning<<endl; - } - - g_quiet=::arg().mustDo("quiet"); - - g_weDistributeQueries = ::arg().mustDo("pdns-distributes-queries"); - if(g_weDistributeQueries) { -- L<<Logger::Warning<<"PowerDNS Recursor itself will distribute queries over threads"<<endl; -+ g_log<<Logger::Warning<<"PowerDNS Recursor itself will distribute queries over threads"<<endl; - } - - setupDelegationOnly(); -@@ -2736,7 +2736,7 @@ int serviceMain(int argc, char*argv[]) - else if(::arg()["dnssec"]=="log-fail") - g_dnssecmode=DNSSECMode::ValidateForLog; - else { -- L<<Logger::Error<<"Unknown DNSSEC mode "<<::arg()["dnssec"]<<endl; -+ g_log<<Logger::Error<<"Unknown DNSSEC mode "<<::arg()["dnssec"]<<endl; - exit(1); - } - -@@ -2801,8 +2801,8 @@ int serviceMain(int argc, char*argv[]) - } - - if(::arg().mustDo("daemon")) { -- L<<Logger::Warning<<"Calling daemonize, going to background"<<endl; -- L.toConsole(Logger::Critical); -+ g_log<<Logger::Warning<<"Calling daemonize, going to background"<<endl; -+ g_log.toConsole(Logger::Critical); - daemonize(); - loadRecursorLuaConfig(::arg()["lua-config-file"], false); - } -@@ -2816,7 +2816,7 @@ int serviceMain(int argc, char*argv[]) - - #ifdef HAVE_LIBSODIUM - if (sodium_init() == -1) { -- L<<Logger::Error<<"Unable to initialize sodium crypto library"<<endl; -+ g_log<<Logger::Error<<"Unable to initialize sodium crypto library"<<endl; - exit(99); - } - #endif -@@ -2838,16 +2838,16 @@ int serviceMain(int argc, char*argv[]) - char *ns; - ns = getenv("NOTIFY_SOCKET"); - if (ns != nullptr) { -- L<<Logger::Error<<"Unable to chroot when running from systemd. Please disable chroot= or set the 'Type' for this service to 'simple'"<<endl; -+ g_log<<Logger::Error<<"Unable to chroot when running from systemd. Please disable chroot= or set the 'Type' for this service to 'simple'"<<endl; - exit(1); - } - #endif - if (chroot(::arg()["chroot"].c_str())<0 || chdir("/") < 0) { -- L<<Logger::Error<<"Unable to chroot to '"+::arg()["chroot"]+"': "<<strerror (errno)<<", exiting"<<endl; -+ g_log<<Logger::Error<<"Unable to chroot to '"+::arg()["chroot"]+"': "<<strerror (errno)<<", exiting"<<endl; - exit(1); - } - else -- L<<Logger::Error<<"Chrooted to '"<<::arg()["chroot"]<<"'"<<endl; -+ g_log<<Logger::Error<<"Chrooted to '"<<::arg()["chroot"]<<"'"<<endl; - } - - s_pidfname=::arg()["socket-dir"]+"/"+s_programname+".pid"; -@@ -2865,7 +2865,7 @@ int serviceMain(int argc, char*argv[]) - g_maxTCPPerClient=::arg().asNum("max-tcp-per-client"); - - if(g_numThreads == 1) { -- L<<Logger::Warning<<"Operating unthreaded"<<endl; -+ g_log<<Logger::Warning<<"Operating unthreaded"<<endl; - #ifdef HAVE_SYSTEMD - sd_notify(0, "READY=1"); - #endif -@@ -2873,7 +2873,7 @@ int serviceMain(int argc, char*argv[]) - } - else { - pthread_t tid; -- L<<Logger::Warning<<"Launching "<< g_numThreads <<" threads"<<endl; -+ g_log<<Logger::Warning<<"Launching "<< g_numThreads <<" threads"<<endl; - for(unsigned int n=0; n < g_numThreads; ++n) { - pthread_create(&tid, 0, recursorThread, (void*)(long)n); - } -@@ -2902,18 +2902,18 @@ try - #ifdef HAVE_PROTOBUF - t_uuidGenerator = new boost::uuids::random_generator(); - #endif -- L<<Logger::Warning<<"Done priming cache with root hints"<<endl; -+ g_log<<Logger::Warning<<"Done priming cache with root hints"<<endl; - - t_pdl = new shared_ptr<RecursorLua4>(); - - try { - if(!::arg()["lua-dns-script"].empty()) { - *t_pdl = shared_ptr<RecursorLua4>(new RecursorLua4(::arg()["lua-dns-script"])); -- L<<Logger::Warning<<"Loaded 'lua' script from '"<<::arg()["lua-dns-script"]<<"'"<<endl; -+ g_log<<Logger::Warning<<"Loaded 'lua' script from '"<<::arg()["lua-dns-script"]<<"'"<<endl; - } - } - catch(std::exception &e) { -- L<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl; - _exit(99); - } - -@@ -2943,16 +2943,16 @@ try - t_fdm=getMultiplexer(); - if(!t_id) { - if(::arg().mustDo("webserver")) { -- L<<Logger::Warning << "Enabling web server" << endl; -+ g_log<<Logger::Warning << "Enabling web server" << endl; - try { - new RecursorWebServer(t_fdm); - } - catch(PDNSException &e) { -- L<<Logger::Error<<"Exception: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Exception: "<<e.reason<<endl; - exit(99); - } - } -- L<<Logger::Error<<"Enabled '"<< t_fdm->getName() << "' multiplexer"<<endl; -+ g_log<<Logger::Error<<"Enabled '"<< t_fdm->getName() << "' multiplexer"<<endl; - } - - t_fdm->addReadFD(g_pipes[t_id].readToThread, handlePipeRequest); -@@ -2986,7 +2986,7 @@ try - for(expired_t::iterator i=expired.begin() ; i != expired.end(); ++i) { - shared_ptr<TCPConnection> conn=any_cast<shared_ptr<TCPConnection> >(i->second); - if(g_logCommonErrors) -- L<<Logger::Warning<<"Timeout from remote TCP client "<< conn->d_remote.toString() <<endl; -+ g_log<<Logger::Warning<<"Timeout from remote TCP client "<< conn->d_remote.toString() <<endl; - t_fdm->removeReadFD(i->first); - } - } -@@ -3026,15 +3026,15 @@ try - } - } - catch(PDNSException &ae) { -- L<<Logger::Error<<"Exception: "<<ae.reason<<endl; -+ g_log<<Logger::Error<<"Exception: "<<ae.reason<<endl; - return 0; - } - catch(std::exception &e) { -- L<<Logger::Error<<"STL Exception: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"STL Exception: "<<e.what()<<endl; - return 0; - } - catch(...) { -- L<<Logger::Error<<"any other exception in main: "<<endl; -+ g_log<<Logger::Error<<"any other exception in main: "<<endl; - return 0; - } - -@@ -3153,7 +3153,7 @@ int main(int argc, char **argv) - ::arg().setCmd("help","Provide a helpful message"); - ::arg().setCmd("version","Print version string"); - ::arg().setCmd("config","Output blank configuration"); -- L.toConsole(Logger::Info); -+ g_log.toConsole(Logger::Info); - ::arg().laxParse(argc,argv); // do a lax parse - - string configname=::arg()["config-dir"]+"/recursor.conf"; -@@ -3169,12 +3169,12 @@ int main(int argc, char **argv) - } - - if(!::arg().file(configname.c_str())) -- L<<Logger::Warning<<"Unable to parse configuration file '"<<configname<<"'"<<endl; -+ g_log<<Logger::Warning<<"Unable to parse configuration file '"<<configname<<"'"<<endl; - - ::arg().parse(argc,argv); - - if( !::arg()["chroot"].empty() && !::arg()["api-config-dir"].empty() && !::arg().mustDo("api-readonly") ) { -- L<<Logger::Error<<"Using chroot and a writable API is not possible"<<endl; -+ g_log<<Logger::Error<<"Using chroot and a writable API is not possible"<<endl; - exit(EXIT_FAILURE); - } - -@@ -3208,21 +3208,21 @@ int main(int argc, char **argv) - if(!g_quiet && logUrgency < Logger::Info) { // Logger::Info=6, Logger::Debug=7 - logUrgency = Logger::Info; // if you do --quiet=no, you need Info to also see the query log - } -- L.setLoglevel(logUrgency); -- L.toConsole(logUrgency); -+ g_log.setLoglevel(logUrgency); -+ g_log.toConsole(logUrgency); - - serviceMain(argc, argv); - } - catch(PDNSException &ae) { -- L<<Logger::Error<<"Exception: "<<ae.reason<<endl; -+ g_log<<Logger::Error<<"Exception: "<<ae.reason<<endl; - ret=EXIT_FAILURE; - } - catch(std::exception &e) { -- L<<Logger::Error<<"STL Exception: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"STL Exception: "<<e.what()<<endl; - ret=EXIT_FAILURE; - } - catch(...) { -- L<<Logger::Error<<"any other exception in main: "<<endl; -+ g_log<<Logger::Error<<"any other exception in main: "<<endl; - ret=EXIT_FAILURE; - } - -@@ -3249,22 +3249,22 @@ int getRootNS(void) { - } - catch(PDNSException& e) - { -- L<<Logger::Error<<"Failed to update . records, got an exception: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Failed to update . records, got an exception: "<<e.reason<<endl; - } - - catch(std::exception& e) - { -- L<<Logger::Error<<"Failed to update . records, got an exception: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Failed to update . records, got an exception: "<<e.what()<<endl; - } - - catch(...) - { -- L<<Logger::Error<<"Failed to update . records, got an exception"<<endl; -+ g_log<<Logger::Error<<"Failed to update . records, got an exception"<<endl; - } - if(!res) { -- L<<Logger::Notice<<"Refreshed . records"<<endl; -+ g_log<<Logger::Notice<<"Refreshed . records"<<endl; - } - else -- L<<Logger::Error<<"Failed to update . records, RCODE="<<res<<endl; -+ g_log<<Logger::Error<<"Failed to update . records, RCODE="<<res<<endl; - return res; - } ---- randomhelper.cc.orig 2018-11-06 14:56:58 UTC -+++ randomhelper.cc -@@ -11,11 +11,11 @@ - - void seedRandom(const string& source) - { -- L<<Logger::Warning<<"Reading random entropy from '"<<source<<"'"<<endl; -+ g_log<<Logger::Warning<<"Reading random entropy from '"<<source<<"'"<<endl; - - int fd=open(source.c_str(), O_RDONLY); - if(fd < 0) { -- L<<Logger::Error<<"Unable to open source of random '"<<source<<"': "<<stringerror()<<endl; -+ g_log<<Logger::Error<<"Unable to open source of random '"<<source<<"': "<<stringerror()<<endl; - exit(EXIT_FAILURE); - } - char seed[16]; -@@ -24,12 +24,12 @@ void seedRandom(const string& source) - while(pos!=sizeof(seed)) { - ret = read(fd, seed+pos, sizeof(seed)-pos); - if(ret < 0) { -- L<<Logger::Error<<"Unable to read random seed from "<<source<<": "<<stringerror()<<endl; -+ g_log<<Logger::Error<<"Unable to read random seed from "<<source<<": "<<stringerror()<<endl; - close(fd); - exit(EXIT_FAILURE); - } - if(!ret) { -- L<<Logger::Error<<"Unable to read random seed from "<<source<<": end of file"<<endl; -+ g_log<<Logger::Error<<"Unable to read random seed from "<<source<<": end of file"<<endl; - close(fd); - exit(EXIT_FAILURE); - } ---- rec-carbon.cc.orig 2018-11-06 14:56:58 UTC -+++ rec-carbon.cc -@@ -60,16 +60,16 @@ try - - int ret=asendtcp(msg, &s); // this will actually do the right thing waiting on the connect - if(ret < 0) -- L<<Logger::Warning<<"Error writing carbon data to "<<remote.toStringWithPort()<<": "<<strerror(errno)<<endl; -+ g_log<<Logger::Warning<<"Error writing carbon data to "<<remote.toStringWithPort()<<": "<<strerror(errno)<<endl; - if(ret==0) -- L<<Logger::Warning<<"Timeout connecting/writing carbon data to "<<remote.toStringWithPort()<<endl; -+ g_log<<Logger::Warning<<"Timeout connecting/writing carbon data to "<<remote.toStringWithPort()<<endl; - } - } - catch(PDNSException& e) - { -- L<<Logger::Error<<"Error in carbon thread: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error in carbon thread: "<<e.reason<<endl; - } - catch(std::exception& e) - { -- L<<Logger::Error<<"Error in carbon thread: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Error in carbon thread: "<<e.what()<<endl; - } ---- rec-lua-conf.cc.orig 2018-11-06 14:56:58 UTC -+++ rec-lua-conf.cc -@@ -119,13 +119,13 @@ void loadRecursorLuaConfig(const std::st - lci.dfe.reserve(zoneIdx, static_cast<size_t>(boost::get<int>(constGet(have, "zoneSizeHint")))); - } - } -- theL()<<Logger::Warning<<"Loading RPZ from file '"<<filename<<"'"<<endl; -+ g_log<<Logger::Warning<<"Loading RPZ from file '"<<filename<<"'"<<endl; - lci.dfe.setPolicyName(zoneIdx, polName); - loadRPZFromFile(filename, lci.dfe, defpol, zoneIdx); -- theL()<<Logger::Warning<<"Done loading RPZ from file '"<<filename<<"'"<<endl; -+ g_log<<Logger::Warning<<"Done loading RPZ from file '"<<filename<<"'"<<endl; - } - catch(std::exception& e) { -- theL()<<Logger::Error<<"Unable to load RPZ zone from '"<<filename<<"': "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Unable to load RPZ zone from '"<<filename<<"': "<<e.what()<<endl; - } - }); - -@@ -198,10 +198,10 @@ void loadRecursorLuaConfig(const std::st - } - } - catch(std::exception& e) { -- theL()<<Logger::Error<<"Unable to load RPZ zone '"<<zone_<<"' from '"<<master_<<"': "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Unable to load RPZ zone '"<<zone_<<"' from '"<<master_<<"': "<<e.what()<<endl; - } - catch(PDNSException& e) { -- theL()<<Logger::Error<<"Unable to load RPZ zone '"<<zone_<<"' from '"<<master_<<"': "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Unable to load RPZ zone '"<<zone_<<"' from '"<<master_<<"': "<<e.reason<<endl; - } - - }); -@@ -234,7 +234,7 @@ void loadRecursorLuaConfig(const std::st - } - } - catch(std::exception& e) { -- theL()<<Logger::Error<<"Error in addSortList: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Error in addSortList: "<<e.what()<<endl; - } - }); - -@@ -282,14 +282,14 @@ void loadRecursorLuaConfig(const std::st - } - } - else { -- theL()<<Logger::Error<<"Only one protobuf server can be configured, we already have "<<lci.protobufServer->toString()<<endl; -+ g_log<<Logger::Error<<"Only one protobuf server can be configured, we already have "<<lci.protobufServer->toString()<<endl; - } - } - catch(std::exception& e) { -- theL()<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.what()<<endl; - } - catch(PDNSException& e) { -- theL()<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.reason<<endl; - } - }); - -@@ -302,14 +302,14 @@ void loadRecursorLuaConfig(const std::st - } - } - else { -- theL()<<Logger::Error<<"Only one protobuf server can be configured, we already have "<<lci.protobufServer->toString()<<endl; -+ g_log<<Logger::Error<<"Only one protobuf server can be configured, we already have "<<lci.protobufServer->toString()<<endl; - } - } - catch(std::exception& e) { -- theL()<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.what()<<endl; - } - catch(PDNSException& e) { -- theL()<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.reason<<endl; -+ g_log<<Logger::Error<<"Error while starting protobuf logger to '"<<server_<<": "<<e.reason<<endl; - } - }); - #endif -@@ -319,22 +319,22 @@ void loadRecursorLuaConfig(const std::st - g_luaconfs.setState(lci); - } - catch(const LuaContext::ExecutionErrorException& e) { -- theL()<<Logger::Error<<"Unable to load Lua script from '"+fname+"': "; -+ g_log<<Logger::Error<<"Unable to load Lua script from '"+fname+"': "; - try { - std::rethrow_if_nested(e); - } catch(const std::exception& exp) { - // exp is the exception that was thrown from inside the lambda -- theL() << exp.what() << std::endl; -+ g_log << exp.what() << std::endl; - } - catch(const PDNSException& exp) { - // exp is the exception that was thrown from inside the lambda -- theL() << exp.reason << std::endl; -+ g_log << exp.reason << std::endl; - } - throw; - - } - catch(std::exception& err) { -- theL()<<Logger::Error<<"Unable to load Lua script from '"+fname+"': "<<err.what()<<endl; -+ g_log<<Logger::Error<<"Unable to load Lua script from '"+fname+"': "<<err.what()<<endl; - throw; - } - ---- rec_channel_rec.cc.orig 2018-11-06 14:56:58 UTC -+++ rec_channel_rec.cc -@@ -354,7 +354,7 @@ string doSetDnssecLogBogus(T begin, T en - - if (pdns_iequals(*begin, "on") || pdns_iequals(*begin, "yes")) { - if (!g_dnssecLogBogus) { -- L<<Logger::Warning<<"Enabeling DNSSEC Bogus logging, requested via control channel"<<endl; -+ g_log<<Logger::Warning<<"Enabeling DNSSEC Bogus logging, requested via control channel"<<endl; - g_dnssecLogBogus = true; - return "DNSSEC Bogus logging enabled\n"; - } -@@ -363,7 +363,7 @@ string doSetDnssecLogBogus(T begin, T en - - if (pdns_iequals(*begin, "off") || pdns_iequals(*begin, "no")) { - if (g_dnssecLogBogus) { -- L<<Logger::Warning<<"Disabeling DNSSEC Bogus logging, requested via control channel"<<endl; -+ g_log<<Logger::Warning<<"Disabeling DNSSEC Bogus logging, requested via control channel"<<endl; - g_dnssecLogBogus = false; - return "DNSSEC Bogus logging disabled\n"; - } -@@ -398,7 +398,7 @@ string doAddNTA(T begin, T end) - if (begin != end) - why += " "; - } -- L<<Logger::Warning<<"Adding Negative Trust Anchor for "<<who<<" with reason '"<<why<<"', requested via control channel"<<endl; -+ g_log<<Logger::Warning<<"Adding Negative Trust Anchor for "<<who<<" with reason '"<<why<<"', requested via control channel"<<endl; - g_luaconfs.modify([who, why](LuaConfigItems& lci) { - lci.negAnchors[who] = why; - }); -@@ -413,7 +413,7 @@ string doClearNTA(T begin, T end) - return "No Negative Trust Anchor specified, doing nothing.\n"; - - if (begin + 1 == end && *begin == "*"){ -- L<<Logger::Warning<<"Clearing all Negative Trust Anchors, requested via control channel"<<endl; -+ g_log<<Logger::Warning<<"Clearing all Negative Trust Anchors, requested via control channel"<<endl; - g_luaconfs.modify([](LuaConfigItems& lci) { - lci.negAnchors.clear(); - }); -@@ -441,7 +441,7 @@ string doClearNTA(T begin, T end) - string removed(""); - bool first(true); - for (auto const &entry : toRemove) { -- L<<Logger::Warning<<"Clearing Negative Trust Anchor for "<<entry<<", requested via control channel"<<endl; -+ g_log<<Logger::Warning<<"Clearing Negative Trust Anchor for "<<entry<<", requested via control channel"<<endl; - g_luaconfs.modify([entry](LuaConfigItems& lci) { - lci.negAnchors.erase(entry); - }); -@@ -489,17 +489,17 @@ string doAddTA(T begin, T end) - } - - try { -- L<<Logger::Warning<<"Adding Trust Anchor for "<<who<<" with data '"<<what<<"', requested via control channel"; -+ g_log<<Logger::Warning<<"Adding Trust Anchor for "<<who<<" with data '"<<what<<"', requested via control channel"; - g_luaconfs.modify([who, what](LuaConfigItems& lci) { - auto ds=std::dynamic_pointer_cast<DSRecordContent>(DSRecordContent::make(what)); - lci.dsAnchors[who].insert(*ds); - }); - broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, who, true)); -- L<<Logger::Warning<<endl; -+ g_log<<Logger::Warning<<endl; - return "Added Trust Anchor for " + who.toStringRootDot() + " with data " + what + "\n"; - } - catch(std::exception &e) { -- L<<Logger::Warning<<", failed: "<<e.what()<<endl; -+ g_log<<Logger::Warning<<", failed: "<<e.what()<<endl; - return "Unable to add Trust Anchor for " + who.toStringRootDot() + ": " + e.what() + "\n"; - } - } -@@ -531,7 +531,7 @@ string doClearTA(T begin, T end) - string removed(""); - bool first(true); - for (auto const &entry : toRemove) { -- L<<Logger::Warning<<"Removing Trust Anchor for "<<entry<<", requested via control channel"<<endl; -+ g_log<<Logger::Warning<<"Removing Trust Anchor for "<<entry<<", requested via control channel"<<endl; - g_luaconfs.modify([entry](LuaConfigItems& lci) { - lci.dsAnchors.erase(entry); - }); -@@ -901,7 +901,7 @@ RecursorControlParser::RecursorControlPa - - static void doExitGeneric(bool nicely) - { -- L<<Logger::Error<<"Exiting on user request"<<endl; -+ g_log<<Logger::Error<<"Exiting on user request"<<endl; - extern RecursorControlChannel s_rcc; - s_rcc.~RecursorControlChannel(); - -@@ -1215,7 +1215,7 @@ string RecursorControlParser::getAnswer( - - try { - loadRecursorLuaConfig(::arg()["lua-config-file"], false); -- L<<Logger::Warning<<"Reloaded Lua configuration file '"<<::arg()["lua-config-file"]<<"', requested via control channel"<<endl; -+ g_log<<Logger::Warning<<"Reloaded Lua configuration file '"<<::arg()["lua-config-file"]<<"', requested via control channel"<<endl; - return "Reloaded Lua configuration file '"+::arg()["lua-config-file"]+"'\n"; - } - catch(std::exception& e) { -@@ -1240,7 +1240,7 @@ string RecursorControlParser::getAnswer( - - if(cmd=="reload-acls") { - if(!::arg()["chroot"].empty()) { -- L<<Logger::Error<<"Unable to reload ACL when chroot()'ed, requested via control channel"<<endl; -+ g_log<<Logger::Error<<"Unable to reload ACL when chroot()'ed, requested via control channel"<<endl; - return "Unable to reload ACL when chroot()'ed, please restart\n"; - } - -@@ -1249,12 +1249,12 @@ string RecursorControlParser::getAnswer( - } - catch(std::exception& e) - { -- L<<Logger::Error<<"Reloading ACLs failed (Exception: "<<e.what()<<")"<<endl; -+ g_log<<Logger::Error<<"Reloading ACLs failed (Exception: "<<e.what()<<")"<<endl; - return e.what() + string("\n"); - } - catch(PDNSException& ae) - { -- L<<Logger::Error<<"Reloading ACLs failed (PDNSException: "<<ae.reason<<")"<<endl; -+ g_log<<Logger::Error<<"Reloading ACLs failed (PDNSException: "<<ae.reason<<")"<<endl; - return ae.reason + string("\n"); - } - return "ok\n"; -@@ -1293,7 +1293,7 @@ string RecursorControlParser::getAnswer( - - if(cmd=="reload-zones") { - if(!::arg()["chroot"].empty()) { -- L<<Logger::Error<<"Unable to reload zones and forwards when chroot()'ed, requested via control channel"<<endl; -+ g_log<<Logger::Error<<"Unable to reload zones and forwards when chroot()'ed, requested via control channel"<<endl; - return "Unable to reload zones and forwards when chroot()'ed, please restart\n"; - } - return reloadAuthAndForwards(); ---- recursor_cache.hh.orig 2018-11-06 14:56:58 UTC -+++ recursor_cache.hh -@@ -30,7 +30,6 @@ - #include <iostream> - #include "dnsrecords.hh" - #include <boost/utility.hpp> --#undef L - #include <boost/multi_index_container.hpp> - #include <boost/multi_index/ordered_index.hpp> - #include <boost/tuple/tuple_comparison.hpp> -@@ -40,7 +39,6 @@ - #include "iputils.hh" - #undef max - --#define L theL() - #include "namespaces.hh" - using namespace ::boost::multi_index; - ---- reczones.cc.orig 2018-11-06 14:56:58 UTC -+++ reczones.cc -@@ -124,10 +124,10 @@ static void makeNameToIPZone(SyncRes::do - ad.d_records.insert(dr); - - if(newMap->count(dr.d_name)) { -- L<<Logger::Warning<<"Hosts file will not overwrite zone '"<<dr.d_name<<"' already loaded"<<endl; -+ g_log<<Logger::Warning<<"Hosts file will not overwrite zone '"<<dr.d_name<<"' already loaded"<<endl; - } - else { -- L<<Logger::Warning<<"Inserting forward zone '"<<dr.d_name<<"' based on hosts file"<<endl; -+ g_log<<Logger::Warning<<"Inserting forward zone '"<<dr.d_name<<"' based on hosts file"<<endl; - (*newMap)[dr.d_name]=ad; - } - } -@@ -169,11 +169,11 @@ static void makeIPToNamesZone(SyncRes::d - } - - if(newMap->count(dr.d_name)) { -- L<<Logger::Warning<<"Will not overwrite zone '"<<dr.d_name<<"' already loaded"<<endl; -+ g_log<<Logger::Warning<<"Will not overwrite zone '"<<dr.d_name<<"' already loaded"<<endl; - } - else { - if(ipparts.size()==4) -- L<<Logger::Warning<<"Inserting reverse zone '"<<dr.d_name<<"' based on hosts file"<<endl; -+ g_log<<Logger::Warning<<"Inserting reverse zone '"<<dr.d_name<<"' based on hosts file"<<endl; - (*newMap)[dr.d_name]=ad; - } - } -@@ -218,15 +218,15 @@ void convertServersForAD(const std::stri - - for(vector<string>::const_iterator iter = servers.begin(); iter != servers.end(); ++iter) { - if(verbose && iter != servers.begin()) -- L<<", "; -+ g_log<<", "; - - ComboAddress addr=parseIPAndPort(*iter, 53); - if(verbose) -- L<<addr.toStringWithPort(); -+ g_log<<addr.toStringWithPort(); - ad.d_servers.push_back(addr); - } - if(verbose) -- L<<endl; -+ g_log<<endl; - } - - void* pleaseWipeNegCache() -@@ -246,7 +246,7 @@ string reloadAuthAndForwards() - SyncRes::domainmap_t* original=t_sstorage->domainmap; - - try { -- L<<Logger::Warning<<"Reloading zones, purging data from cache"<<endl; -+ g_log<<Logger::Warning<<"Reloading zones, purging data from cache"<<endl; - - for(SyncRes::domainmap_t::const_iterator i = t_sstorage->domainmap->begin(); i != t_sstorage->domainmap->end(); ++i) { - for(SyncRes::AuthDomain::records_t::const_iterator j = i->second.d_records.begin(); j != i->second.d_records.end(); ++j) -@@ -304,13 +304,13 @@ string reloadAuthAndForwards() - return "ok\n"; - } - catch(std::exception& e) { -- L<<Logger::Error<<"Encountered error reloading zones, keeping original data: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Encountered error reloading zones, keeping original data: "<<e.what()<<endl; - } - catch(PDNSException& ae) { -- L<<Logger::Error<<"Encountered error reloading zones, keeping original data: "<<ae.reason<<endl; -+ g_log<<Logger::Error<<"Encountered error reloading zones, keeping original data: "<<ae.reason<<endl; - } - catch(...) { -- L<<Logger::Error<<"Encountered unknown error reloading zones, keeping original data"<<endl; -+ g_log<<Logger::Error<<"Encountered unknown error reloading zones, keeping original data"<<endl; - } - return "reloading failed, see log\n"; - } -@@ -325,7 +325,7 @@ void RPZIXFRTracker(const ComboAddress& - - sleep(refresh); - -- L<<Logger::Info<<"Getting IXFR deltas for "<<zone<<" from "<<master.toStringWithPort()<<", our serial: "<<getRR<SOARecordContent>(dr)->d_st.serial<<endl; -+ g_log<<Logger::Info<<"Getting IXFR deltas for "<<zone<<" from "<<master.toStringWithPort()<<", our serial: "<<getRR<SOARecordContent>(dr)->d_st.serial<<endl; - vector<pair<vector<DNSRecord>, vector<DNSRecord> > > deltas; - - ComboAddress local(localAddress); -@@ -335,12 +335,12 @@ void RPZIXFRTracker(const ComboAddress& - try { - deltas = getIXFRDeltas(master, zone, dr, tt, &local, maxReceivedBytes); - } catch(std::runtime_error& e ){ -- L<<Logger::Warning<<e.what()<<endl; -+ g_log<<Logger::Warning<<e.what()<<endl; - continue; - } - if(deltas.empty()) - continue; -- L<<Logger::Info<<"Processing "<<deltas.size()<<" delta"<<addS(deltas)<<" for RPZ "<<zone<<endl; -+ g_log<<Logger::Info<<"Processing "<<deltas.size()<<" delta"<<addS(deltas)<<" for RPZ "<<zone<<endl; - - auto luaconfsCopy = g_luaconfs.getCopy(); - int totremove=0, totadd=0; -@@ -348,7 +348,7 @@ void RPZIXFRTracker(const ComboAddress& - const auto& remove = delta.first; - const auto& add = delta.second; - if(remove.empty()) { -- L<<Logger::Warning<<"IXFR update is a whole new zone"<<endl; -+ g_log<<Logger::Warning<<"IXFR update is a whole new zone"<<endl; - luaconfsCopy.dfe.clear(polZone); - } - for(const auto& rr : remove) { // should always contain the SOA -@@ -360,11 +360,11 @@ void RPZIXFRTracker(const ComboAddress& - // cout<<"Got good removal of SOA serial "<<oldsr->d_st.serial<<endl; - } - else -- L<<Logger::Error<<"GOT WRONG SOA SERIAL REMOVAL, SHOULD TRIGGER WHOLE RELOAD"<<endl; -+ g_log<<Logger::Error<<"GOT WRONG SOA SERIAL REMOVAL, SHOULD TRIGGER WHOLE RELOAD"<<endl; - } - else { - totremove++; -- L<<Logger::Debug<<"Had removal of "<<rr.d_name<<endl; -+ g_log<<Logger::Debug<<"Had removal of "<<rr.d_name<<endl; - RPZRecordToPolicy(rr, luaconfsCopy.dfe, false, defpol, polZone); - } - } -@@ -374,19 +374,19 @@ void RPZIXFRTracker(const ComboAddress& - continue; - if(rr.d_type == QType::SOA) { - auto newsr = getRR<SOARecordContent>(rr); -- // L<<Logger::Info<<"New SOA serial for "<<zone<<": "<<newsr->d_st.serial<<endl; -+ // g_log<<Logger::Info<<"New SOA serial for "<<zone<<": "<<newsr->d_st.serial<<endl; - if (newsr) { - oursr = newsr; - } - } - else { - totadd++; -- L<<Logger::Debug<<"Had addition of "<<rr.d_name<<endl; -+ g_log<<Logger::Debug<<"Had addition of "<<rr.d_name<<endl; - RPZRecordToPolicy(rr, luaconfsCopy.dfe, true, defpol, polZone); - } - } - } -- L<<Logger::Info<<"Had "<<totremove<<" RPZ removal"<<addS(totremove)<<", "<<totadd<<" addition"<<addS(totadd)<<" for "<<zone<<" New serial: "<<oursr->d_st.serial<<endl; -+ g_log<<Logger::Info<<"Had "<<totremove<<" RPZ removal"<<addS(totremove)<<", "<<totadd<<" addition"<<addS(totadd)<<" for "<<zone<<" New serial: "<<oursr->d_st.serial<<endl; - g_luaconfs.setState(luaconfsCopy); - } - } -@@ -414,7 +414,7 @@ SyncRes::domainmap_t* parseAuthAndForwar - // headers.first=toCanonic("", headers.first); - if(n==0) { - ad.d_rdForward = false; -- L<<Logger::Error<<"Parsing authoritative data for zone '"<<headers.first<<"' from file '"<<headers.second<<"'"<<endl; -+ g_log<<Logger::Error<<"Parsing authoritative data for zone '"<<headers.first<<"' from file '"<<headers.second<<"'"<<endl; - ZoneParserTNG zpt(headers.second, DNSName(headers.first)); - DNSResourceRecord rr; - DNSRecord dr; -@@ -436,13 +436,13 @@ SyncRes::domainmap_t* parseAuthAndForwar - } - } - else { -- L<<Logger::Error<<"Redirecting queries for zone '"<<headers.first<<"' "; -+ g_log<<Logger::Error<<"Redirecting queries for zone '"<<headers.first<<"' "; - if(n == 2) { -- L<<"with recursion "; -+ g_log<<"with recursion "; - ad.d_rdForward = true; - } - else ad.d_rdForward = false; -- L<<"to: "; -+ g_log<<"to: "; - - convertServersForAD(headers.second, ad, ";"); - if(n == 2) { -@@ -455,7 +455,7 @@ SyncRes::domainmap_t* parseAuthAndForwar - } - - if(!::arg()["forward-zones-file"].empty()) { -- L<<Logger::Warning<<"Reading zone forwarding information from '"<<::arg()["forward-zones-file"]<<"'"<<endl; -+ g_log<<Logger::Warning<<"Reading zone forwarding information from '"<<::arg()["forward-zones-file"]<<"'"<<endl; - SyncRes::AuthDomain ad; - FILE *rfp=fopen(::arg()["forward-zones-file"].c_str(), "r"); - -@@ -502,7 +502,7 @@ SyncRes::domainmap_t* parseAuthAndForwar - - (*newMap)[DNSName(domain)]=ad; - } -- L<<Logger::Warning<<"Done parsing " << newMap->size() - before<<" forwarding instructions from file '"<<::arg()["forward-zones-file"]<<"'"<<endl; -+ g_log<<Logger::Warning<<"Done parsing " << newMap->size() - before<<" forwarding instructions from file '"<<::arg()["forward-zones-file"]<<"'"<<endl; - } - - if(::arg().mustDo("export-etc-hosts")) { -@@ -511,7 +511,7 @@ SyncRes::domainmap_t* parseAuthAndForwar - - ifstream ifs(fname.c_str()); - if(!ifs) { -- L<<Logger::Warning<<"Could not open /etc/hosts for reading"<<endl; -+ g_log<<Logger::Warning<<"Could not open /etc/hosts for reading"<<endl; - } - else { - string searchSuffix = ::arg()["export-etc-hosts-search-suffix"]; -@@ -543,7 +543,7 @@ SyncRes::domainmap_t* parseAuthAndForwar - } - } - if(::arg().mustDo("serve-rfc1918")) { -- L<<Logger::Warning<<"Inserting rfc 1918 private space zones"<<endl; -+ g_log<<Logger::Warning<<"Inserting rfc 1918 private space zones"<<endl; - parts.clear(); - parts.push_back("127"); - makeIPToNamesZone(newMap, parts); ---- remote_logger.cc.orig 2018-11-06 14:56:58 UTC -+++ remote_logger.cc -@@ -21,7 +21,7 @@ bool RemoteLogger::reconnect() - } - catch(const std::exception& e) { - #ifdef WE_ARE_RECURSOR -- L<<Logger::Warning<<"Error connecting to remote logger "<<d_remote.toStringWithPort()<<": "<<e.what()<<std::endl; -+ g_log<<Logger::Warning<<"Error connecting to remote logger "<<d_remote.toStringWithPort()<<": "<<e.what()<<std::endl; - #else - warnlog("Error connecting to remote logger %s: %s", d_remote.toStringWithPort(), e.what()); - #endif -@@ -56,7 +56,7 @@ void RemoteLogger::worker() - } - catch(const std::runtime_error& e) { - #ifdef WE_ARE_RECURSOR -- L<<Logger::Info<<"Error sending data to remote logger "<<d_remote.toStringWithPort()<<": "<< e.what()<<endl; -+ g_log<<Logger::Info<<"Error sending data to remote logger "<<d_remote.toStringWithPort()<<": "<< e.what()<<endl; - #else - vinfolog("Error sending data to remote logger (%s): %s", d_remote.toStringWithPort(), e.what()); - #endif ---- rpzloader.cc.orig 2018-11-06 14:56:58 UTC -+++ rpzloader.cc -@@ -159,9 +159,9 @@ void RPZRecordToPolicy(const DNSRecord& - - shared_ptr<SOARecordContent> loadRPZFromServer(const ComboAddress& master, const DNSName& zone, DNSFilterEngine& target, boost::optional<DNSFilterEngine::Policy> defpol, size_t place, const TSIGTriplet& tt, size_t maxReceivedBytes, const ComboAddress& localAddress) - { -- L<<Logger::Warning<<"Loading RPZ zone '"<<zone<<"' from "<<master.toStringWithPort()<<endl; -+ g_log<<Logger::Warning<<"Loading RPZ zone '"<<zone<<"' from "<<master.toStringWithPort()<<endl; - if(!tt.name.empty()) -- L<<Logger::Warning<<"With TSIG key '"<<tt.name<<"' of algorithm '"<<tt.algo<<"'"<<endl; -+ g_log<<Logger::Warning<<"With TSIG key '"<<tt.name<<"' of algorithm '"<<tt.algo<<"'"<<endl; - - ComboAddress local(localAddress); - if (local == ComboAddress()) -@@ -189,11 +189,11 @@ shared_ptr<SOARecordContent> loadRPZFrom - nrecords++; - } - if(last != time(0)) { -- L<<Logger::Info<<"Loaded & indexed "<<nrecords<<" policy records so far"<<endl; -+ g_log<<Logger::Info<<"Loaded & indexed "<<nrecords<<" policy records so far"<<endl; - last=time(0); - } - } -- L<<Logger::Info<<"Done: "<<nrecords<<" policy records active, SOA: "<<sr->getZoneRepresentation()<<endl; -+ g_log<<Logger::Info<<"Done: "<<nrecords<<" policy records active, SOA: "<<sr->getZoneRepresentation()<<endl; - return sr; - } - ---- secpoll-recursor.cc.orig 2018-11-06 14:56:58 UTC -+++ secpoll-recursor.cc -@@ -53,7 +53,7 @@ void doSecPoll(time_t* last_secpoll) - } - - if(state == Bogus) { -- L<<Logger::Error<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', DNSSEC validation result was Bogus!"<<endl; -+ g_log<<Logger::Error<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', DNSSEC validation result was Bogus!"<<endl; - if(g_security_status == 1) // If we were OK, go to unknown - g_security_status = 0; - return; -@@ -77,18 +77,18 @@ void doSecPoll(time_t* last_secpoll) - } - else { - if(pkgv.find("0.0.")) -- L<<Logger::Warning<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', RCODE = "<< RCode::to_s(res)<<endl; -+ g_log<<Logger::Warning<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', RCODE = "<< RCode::to_s(res)<<endl; - else -- L<<Logger::Warning<<"Ignoring response for security status update, this is a non-release version."<<endl; -+ g_log<<Logger::Warning<<"Ignoring response for security status update, this is a non-release version."<<endl; - - if(g_security_status == 1) // it was ok, now it is unknown - g_security_status = 0; - } - - if(g_security_status == 2) { -- L<<Logger::Error<<"PowerDNS Security Update Recommended: "<<g_security_message<<endl; -+ g_log<<Logger::Error<<"PowerDNS Security Update Recommended: "<<g_security_message<<endl; - } - else if(g_security_status == 3) { -- L<<Logger::Error<<"PowerDNS Security Update Mandatory: "<<g_security_message<<endl; -+ g_log<<Logger::Error<<"PowerDNS Security Update Mandatory: "<<g_security_message<<endl; - } - } ---- syncres.cc.orig 2018-11-06 14:56:58 UTC -+++ syncres.cc -@@ -78,7 +78,7 @@ unsigned int SyncRes::s_maxdepth; - string SyncRes::s_serverID; - SyncRes::LogMode SyncRes::s_lm; - --#define LOG(x) if(d_lm == Log) { L <<Logger::Warning << x; } else if(d_lm == Store) { d_trace << x; } -+#define LOG(x) if(d_lm == Log) { g_log <<Logger::Warning << x; } else if(d_lm == Store) { d_trace << x; } - - bool SyncRes::s_noEDNS; - ---- unix_utility.cc.orig 2018-11-06 14:56:58 UTC -+++ unix_utility.cc -@@ -85,22 +85,22 @@ void Utility::setBindAny(int af, sock_t - (void) one; // avoids 'unused var' warning on systems that have none of the defines checked below - #ifdef IP_FREEBIND - if (setsockopt(sock, IPPROTO_IP, IP_FREEBIND, &one, sizeof(one)) < 0) -- theL()<<Logger::Warning<<"Warning: IP_FREEBIND setsockopt failed: "<<strerror(errno)<<endl; -+ g_log<<Logger::Warning<<"Warning: IP_FREEBIND setsockopt failed: "<<strerror(errno)<<endl; - #endif - - #ifdef IP_BINDANY - if (af == AF_INET) - if (setsockopt(sock, IPPROTO_IP, IP_BINDANY, &one, sizeof(one)) < 0) -- theL()<<Logger::Warning<<"Warning: IP_BINDANY setsockopt failed: "<<strerror(errno)<<endl; -+ g_log<<Logger::Warning<<"Warning: IP_BINDANY setsockopt failed: "<<strerror(errno)<<endl; - #endif - #ifdef IPV6_BINDANY - if (af == AF_INET6) - if (setsockopt(sock, IPPROTO_IPV6, IPV6_BINDANY, &one, sizeof(one)) < 0) -- theL()<<Logger::Warning<<"Warning: IPV6_BINDANY setsockopt failed: "<<strerror(errno)<<endl; -+ g_log<<Logger::Warning<<"Warning: IPV6_BINDANY setsockopt failed: "<<strerror(errno)<<endl; - #endif - #ifdef SO_BINDANY - if (setsockopt(sock, SOL_SOCKET, SO_BINDANY, &one, sizeof(one)) < 0) -- theL()<<Logger::Warning<<"Warning: SO_BINDANY setsockopt failed: "<<strerror(errno)<<endl; -+ g_log<<Logger::Warning<<"Warning: SO_BINDANY setsockopt failed: "<<strerror(errno)<<endl; - #endif - } - -@@ -129,22 +129,22 @@ void Utility::dropGroupPrivs( int uid, i - { - if(gid) { - if(setgid(gid)<0) { -- theL()<<Logger::Critical<<"Unable to set effective group id to "<<gid<<": "<<stringerror()<<endl; -+ g_log<<Logger::Critical<<"Unable to set effective group id to "<<gid<<": "<<stringerror()<<endl; - exit(1); - } - else -- theL()<<Logger::Info<<"Set effective group id to "<<gid<<endl; -+ g_log<<Logger::Info<<"Set effective group id to "<<gid<<endl; - - struct passwd *pw=getpwuid(uid); - if(!pw) { -- theL()<<Logger::Warning<<"Unable to determine user name for uid "<<uid<<endl; -+ g_log<<Logger::Warning<<"Unable to determine user name for uid "<<uid<<endl; - if (setgroups(0, NULL)<0) { -- theL()<<Logger::Critical<<"Unable to drop supplementary gids: "<<stringerror()<<endl; -+ g_log<<Logger::Critical<<"Unable to drop supplementary gids: "<<stringerror()<<endl; - exit(1); - } - } else { - if (initgroups(pw->pw_name, gid)<0) { -- theL()<<Logger::Critical<<"Unable to set supplementary groups: "<<stringerror()<<endl; -+ g_log<<Logger::Critical<<"Unable to set supplementary groups: "<<stringerror()<<endl; - exit(1); - } - } -@@ -157,11 +157,11 @@ void Utility::dropUserPrivs( int uid ) - { - if(uid) { - if(setuid(uid)<0) { -- theL()<<Logger::Critical<<"Unable to set effective user id to "<<uid<<": "<<stringerror()<<endl; -+ g_log<<Logger::Critical<<"Unable to set effective user id to "<<uid<<": "<<stringerror()<<endl; - exit(1); - } - else -- theL()<<Logger::Info<<"Set effective user id to "<<uid<<endl; -+ g_log<<Logger::Info<<"Set effective user id to "<<uid<<endl; - } - } - -@@ -189,7 +189,7 @@ int Utility::makeGidNumeric(const string - errno=0; - struct group *gr=getgrnam(group.c_str()); - if(!gr) { -- theL()<<Logger::Critical<<"Unable to look up gid of group '"<<group<<"': "<< (errno ? strerror(errno) : "not found") <<endl; -+ g_log<<Logger::Critical<<"Unable to look up gid of group '"<<group<<"': "<< (errno ? strerror(errno) : "not found") <<endl; - exit(1); - } - newgid=gr->gr_gid; -@@ -205,7 +205,7 @@ int Utility::makeUidNumeric(const string - if(!(newuid=atoi(username.c_str()))) { - struct passwd *pw=getpwnam(username.c_str()); - if(!pw) { -- theL()<<Logger::Critical<<"Unable to look up uid of user '"<<username<<"': "<< (errno ? strerror(errno) : "not found") <<endl; -+ g_log<<Logger::Critical<<"Unable to look up uid of user '"<<username<<"': "<< (errno ? strerror(errno) : "not found") <<endl; - exit(1); - } - newuid=pw->pw_uid; ---- validate-recursor.cc.orig 2018-11-06 14:56:58 UTC -+++ validate-recursor.cc -@@ -6,7 +6,7 @@ - DNSSECMode g_dnssecmode{DNSSECMode::ProcessNoValidate}; - bool g_dnssecLogBogus; - --#define LOG(x) if(g_dnssecLOG) { L <<Logger::Warning << x; } -+#define LOG(x) if(g_dnssecLOG) { g_log <<Logger::Warning << x; } - - class SRRecordOracle : public DNSRecordOracle - { ---- validate.cc.orig 2018-11-06 14:56:58 UTC -+++ validate.cc -@@ -6,7 +6,7 @@ - #include "logger.hh" - bool g_dnssecLOG{false}; - --#define LOG(x) if(g_dnssecLOG) { L <<Logger::Warning << x; } -+#define LOG(x) if(g_dnssecLOG) { g_log <<Logger::Warning << x; } - void dotEdge(DNSName zone, string type1, DNSName name1, string tag1, string type2, DNSName name2, string tag2, string color=""); - void dotNode(string type, DNSName name, string tag, string content); - string dotName(string type, DNSName name, string tag); ---- version.cc.orig 2018-11-06 14:56:58 UTC -+++ version.cc -@@ -72,22 +72,22 @@ string productTypeApiType() { - - void showProductVersion() - { -- theL()<<Logger::Warning<<productName()<<" "<< VERSION << " (C) 2001-2017 " -+ g_log<<Logger::Warning<<productName()<<" "<< VERSION << " (C) 2001-2017 " - "PowerDNS.COM BV" << endl; -- theL()<<Logger::Warning<<"Using "<<(sizeof(unsigned long)*8)<<"-bits mode. " -+ g_log<<Logger::Warning<<"Using "<<(sizeof(unsigned long)*8)<<"-bits mode. " - "Built using " << compilerVersion() - #ifndef REPRODUCIBLE - <<" on " __DATE__ " " __TIME__ " by " BUILD_HOST - #endif - <<"."<< endl; -- theL()<<Logger::Warning<<"PowerDNS comes with ABSOLUTELY NO WARRANTY. " -+ g_log<<Logger::Warning<<"PowerDNS comes with ABSOLUTELY NO WARRANTY. " - "This is free software, and you are welcome to redistribute it " - "according to the terms of the GPL version 2." << endl; - } - - void showBuildConfiguration() - { -- theL()<<Logger::Warning<<"Features: "<< -+ g_log<<Logger::Warning<<"Features: "<< - #ifdef HAVE_BOTAN - "botan" << BOTAN_VERSION_MAJOR << "." << BOTAN_VERSION_MINOR << " " << - #endif -@@ -113,12 +113,12 @@ void showBuildConfiguration() - endl; - #ifdef PDNS_MODULES - // Auth only -- theL()<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl; -+ g_log<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl; - #endif - #ifdef PDNS_CONFIG_ARGS - #define double_escape(s) #s - #define escape_quotes(s) double_escape(s) -- theL()<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl; -+ g_log<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl; - #undef escape_quotes - #undef double_escape - #endif ---- webserver.cc.orig 2018-11-06 14:56:58 UTC -+++ webserver.cc -@@ -43,12 +43,12 @@ json11::Json HttpRequest::json() - { - string err; - if(this->body.empty()) { -- L<<Logger::Debug<<"HTTP: JSON document expected in request body, but body was empty" << endl; -+ g_log<<Logger::Debug<<"HTTP: JSON document expected in request body, but body was empty" << endl; - throw HttpBadRequestException(); - } - json11::Json doc = json11::Json::parse(this->body, err); - if (doc.is_null()) { -- L<<Logger::Debug<<"HTTP: parsing of JSON document failed:" << err << endl; -+ g_log<<Logger::Debug<<"HTTP: parsing of JSON document failed:" << err << endl; - throw HttpBadRequestException(); - } - return doc; -@@ -136,13 +136,13 @@ static void apiWrapper(WebServer::Handle - resp->headers["access-control-allow-origin"] = "*"; - - if (api_key.empty()) { -- L<<Logger::Error<<"HTTP API Request \"" << req->url.path << "\": Authentication failed, API Key missing in config" << endl; -+ g_log<<Logger::Error<<"HTTP API Request \"" << req->url.path << "\": Authentication failed, API Key missing in config" << endl; - throw HttpUnauthorizedException("X-API-Key"); - } - bool auth_ok = req->compareHeader("x-api-key", api_key) || req->getvars["api-key"]==api_key; - - if (!auth_ok) { -- L<<Logger::Error<<"HTTP Request \"" << req->url.path << "\": Authentication by API Key failed" << endl; -+ g_log<<Logger::Error<<"HTTP Request \"" << req->url.path << "\": Authentication by API Key failed" << endl; - throw HttpUnauthorizedException("X-API-Key"); - } - -@@ -185,7 +185,7 @@ static void webWrapper(WebServer::Handle - if (!web_password.empty()) { - bool auth_ok = req->compareAuthorization(web_password); - if (!auth_ok) { -- L<<Logger::Debug<<"HTTP Request \"" << req->url.path << "\": Web Authentication failed" << endl; -+ g_log<<Logger::Debug<<"HTTP Request \"" << req->url.path << "\": Web Authentication failed" << endl; - throw HttpUnauthorizedException("Basic"); - } - } -@@ -216,11 +216,11 @@ void WebServer::handleRequest(HttpReques - - try { - if (!req.complete) { -- L<<Logger::Debug<<"HTTP: Incomplete request" << endl; -+ g_log<<Logger::Debug<<"HTTP: Incomplete request" << endl; - throw HttpBadRequestException(); - } - -- L<<Logger::Debug<<"HTTP: Handling request \"" << req.url.path << "\"" << endl; -+ g_log<<Logger::Debug<<"HTTP: Handling request \"" << req.url.path << "\"" << endl; - - YaHTTP::strstr_map_t::iterator header; - -@@ -235,33 +235,33 @@ void WebServer::handleRequest(HttpReques - - YaHTTP::THandlerFunction handler; - if (!YaHTTP::Router::Route(&req, handler)) { -- L<<Logger::Debug<<"HTTP: No route found for \"" << req.url.path << "\"" << endl; -+ g_log<<Logger::Debug<<"HTTP: No route found for \"" << req.url.path << "\"" << endl; - throw HttpNotFoundException(); - } - - try { - handler(&req, &resp); -- L<<Logger::Debug<<"HTTP: Result for \"" << req.url.path << "\": " << resp.status << ", body length: " << resp.body.size() << endl; -+ g_log<<Logger::Debug<<"HTTP: Result for \"" << req.url.path << "\": " << resp.status << ", body length: " << resp.body.size() << endl; - } - catch(HttpException&) { - throw; - } - catch(PDNSException &e) { -- L<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": Exception: " << e.reason << endl; -+ g_log<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": Exception: " << e.reason << endl; - throw HttpInternalServerErrorException(); - } - catch(std::exception &e) { -- L<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": STL Exception: " << e.what() << endl; -+ g_log<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": STL Exception: " << e.what() << endl; - throw HttpInternalServerErrorException(); - } - catch(...) { -- L<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": Unknown Exception" << endl; -+ g_log<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": Unknown Exception" << endl; - throw HttpInternalServerErrorException(); - } - } - catch(HttpException &e) { - resp = e.response(); -- L<<Logger::Debug<<"HTTP: Error result for \"" << req.url.path << "\": " << resp.status << endl; -+ g_log<<Logger::Debug<<"HTTP: Error result for \"" << req.url.path << "\": " << resp.status << endl; - string what = YaHTTP::Utility::status2text(resp.status); - if(req.accept_html) { - resp.headers["Content-Type"] = "text/html; charset=utf-8"; -@@ -321,14 +321,14 @@ try { - client->writenWithTimeout(reply.c_str(), reply.size(), timeout); - } - catch(PDNSException &e) { -- L<<Logger::Error<<"HTTP Exception: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"HTTP Exception: "<<e.reason<<endl; - } - catch(std::exception &e) { - if(strstr(e.what(), "timeout")==0) -- L<<Logger::Error<<"HTTP STL Exception: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"HTTP STL Exception: "<<e.what()<<endl; - } - catch(...) { -- L<<Logger::Error<<"HTTP: Unknown exception"<<endl; -+ g_log<<Logger::Error<<"HTTP: Unknown exception"<<endl; - } - - WebServer::WebServer(const string &listenaddress, int port) : d_server(NULL) -@@ -341,10 +341,10 @@ void WebServer::bind() - { - try { - d_server = createServer(); -- L<<Logger::Warning<<"Listening for HTTP requests on "<<d_server->d_local.toStringWithPort()<<endl; -+ g_log<<Logger::Warning<<"Listening for HTTP requests on "<<d_server->d_local.toStringWithPort()<<endl; - } - catch(NetworkError &e) { -- L<<Logger::Error<<"Listening on HTTP socket failed: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"Listening on HTTP socket failed: "<<e.what()<<endl; - d_server = NULL; - } - } -@@ -369,20 +369,20 @@ void WebServer::go() - } else { - ComboAddress remote; - if (data->client->getRemote(remote)) -- L<<Logger::Error<<"Webserver closing socket: remote ("<< remote.toString() <<") does not match 'webserver-allow-from'"<<endl; -+ g_log<<Logger::Error<<"Webserver closing socket: remote ("<< remote.toString() <<") does not match 'webserver-allow-from'"<<endl; - delete data->client; // close socket - delete data; - } - } - } - catch(PDNSException &e) { -- L<<Logger::Error<<"PDNSException in main webserver thread: "<<e.reason<<endl; -+ g_log<<Logger::Error<<"PDNSException in main webserver thread: "<<e.reason<<endl; - } - catch(std::exception &e) { -- L<<Logger::Error<<"STL Exception in main webserver thread: "<<e.what()<<endl; -+ g_log<<Logger::Error<<"STL Exception in main webserver thread: "<<e.what()<<endl; - } - catch(...) { -- L<<Logger::Error<<"Unknown exception in main webserver thread"<<endl; -+ g_log<<Logger::Error<<"Unknown exception in main webserver thread"<<endl; - } - exit(1); - } ---- ws-recursor.cc.orig 2018-11-06 14:56:58 UTC -+++ ws-recursor.cc -@@ -597,7 +597,7 @@ void AsyncWebServer::serveConnection(Soc - - // now send the reply - if (asendtcp(data, client) == -1 || data.empty()) { -- L<<Logger::Error<<"Failed sending reply to HTTP client"<<endl; -+ g_log<<Logger::Error<<"Failed sending reply to HTTP client"<<endl; - } - } - diff --git a/dns/powerdns-recursor40/files/patch-dnsname.hh b/dns/powerdns-recursor40/files/patch-dnsname.hh deleted file mode 100644 index a1de8ea78853..000000000000 --- a/dns/powerdns-recursor40/files/patch-dnsname.hh +++ /dev/null @@ -1,20 +0,0 @@ ---- dnsname.hh.orig 2017-01-17 03:18:41 UTC -+++ dnsname.hh -@@ -30,7 +30,7 @@ - #include <boost/version.hpp> - - // it crashes on OSX and doesn't compile on OpenBSD --#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) -+#if BOOST_VERSION >= 105300 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__) - #include <boost/container/string.hpp> - #endif - -@@ -133,7 +133,7 @@ public: - inline bool canonCompare(const DNSName& rhs) const; - bool slowCanonCompare(const DNSName& rhs) const; - --#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) -+#if BOOST_VERSION >= 105300 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__) - typedef boost::container::string string_t; - #else - typedef std::string string_t; diff --git a/dns/powerdns-recursor40/files/patch-opensslsigners.cc b/dns/powerdns-recursor40/files/patch-opensslsigners.cc deleted file mode 100644 index be96d5f57172..000000000000 --- a/dns/powerdns-recursor40/files/patch-opensslsigners.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- opensslsigners.cc.orig 2018-01-22 13:39:07 UTC -+++ opensslsigners.cc -@@ -33,7 +33,8 @@ - #include "opensslsigners.hh" - #include "dnssecinfra.hh" - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - /* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */ - static pthread_mutex_t *openssllocks; - diff --git a/dns/powerdns-recursor40/files/pdns-recursor.in b/dns/powerdns-recursor40/files/pdns-recursor.in deleted file mode 100644 index cfa9cb5c772f..000000000000 --- a/dns/powerdns-recursor40/files/pdns-recursor.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# $$ -# - -# PROVIDE: pdns_recursor -# REQUIRE: SERVERS cleanvar -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable pdns_recursor: -# -# pdns_recursor_enable="YES" -# pdns_recursor_flags="<set as needed>" -# -# See pdns_recursor(8) for flags. -# - -. /etc/rc.subr - -name=pdns_recursor -rcvar=pdns_recursor_enable - -command=%%PREFIX%%/sbin/pdns_recursor -command_args="--daemon=yes" - -# set defaults - -pdns_recursor_enable=${pdns_recursor_enable:-"NO"} -pdns_recursor_conf=${pdns_recursor_conf:-"%%PREFIX%%/etc/pdns/recursor.conf"} - -load_rc_config ${name} - -required_files=${pdns_recursor_conf} - -run_rc_command "$1" diff --git a/dns/powerdns-recursor40/files/pkg-message.in b/dns/powerdns-recursor40/files/pkg-message.in deleted file mode 100644 index a5480fd56ad2..000000000000 --- a/dns/powerdns-recursor40/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ - -******************************************************************* - If you want to use the powerdns recursor, - you need the following line in /etc/rc.conf(.local) - - pdns_recursor_enable="YES" - - Configuration templates are available in %%PREFIX%%/etc/pdns - as recursor.conf-dist. -******************************************************************* - diff --git a/dns/powerdns-recursor40/pkg-descr b/dns/powerdns-recursor40/pkg-descr deleted file mode 100644 index 2322694d98dd..000000000000 --- a/dns/powerdns-recursor40/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -PowerDNS recursor is a high performance, simple and secure recursing -nameserver. It currently powers over two million internet connections. - -WWW: https://www.powerdns.com diff --git a/dns/powerdns-recursor40/pkg-plist b/dns/powerdns-recursor40/pkg-plist deleted file mode 100644 index 14fc77b3d5d2..000000000000 --- a/dns/powerdns-recursor40/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -@sample etc/pdns/recursor.conf-dist etc/pdns/recursor.conf -bin/rec_control -sbin/pdns_recursor -man/man1/pdns_recursor.1.gz -man/man1/rec_control.1.gz diff --git a/japanese/Makefile b/japanese/Makefile index 660ca8210f51..6f7da3bbc21d 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -259,7 +259,6 @@ SUBDIR += skkserv SUBDIR += slimeforest SUBDIR += slrn - SUBDIR += spamassassin SUBDIR += srd-fpw-package SUBDIR += suicavalue SUBDIR += t2ps diff --git a/japanese/spamassassin/Makefile b/japanese/spamassassin/Makefile deleted file mode 100644 index 9e755ca624a5..000000000000 --- a/japanese/spamassassin/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Created by: TAOKA Fumiyoshi -# $FreeBSD$ - -PORTREVISION= 0 -CATEGORIES= japanese mail perl5 -PKGNAMEPREFIX= ja- - -MAINTAINER= ports@FreeBSD.org -COMMENT= SpamAssassin with patches to handle multibyte character - -LICENSE= APACHE20 - -BROKEN= patch does not apply -DEPRECATED= does not build -EXPIRATION_DATE=2018-12-31 - -MASTERDIR= ${.CURDIR}/../../mail/spamassassin - -BUILD_DEPENDS= ja-p5-MeCab>=0.98:japanese/p5-MeCab - -CONFLICTS= spamassassin-[0-9]* - -EXTRA_PATCHES= ${.CURDIR}/files/spamassassin-ja.patch - -PKGMESSAGE= ${.CURDIR}/pkg-message -PLIST= ${WRKDIR}/pkg-plist - -TOKENIZER_PRE= tokenizer.pre - -PLIST_SUB+= TOKENIZER_PRE=${TOKENIZER_PRE} - -pre-install: - @${CAT} ${EXTRA_PATCHES:S/.patch/.plist/} > ${PLIST} - @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} - -post-install:: - ${INSTALL_DATA} ${.CURDIR}/files/${TOKENIZER_PRE} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/spamassassin/files/spamassassin-ja.patch b/japanese/spamassassin/files/spamassassin-ja.patch deleted file mode 100644 index 968e1b986aee..000000000000 --- a/japanese/spamassassin/files/spamassassin-ja.patch +++ /dev/null @@ -1,1065 +0,0 @@ ---- lib/Mail/SpamAssassin/HTML.pm 2015-04-29 04:56:49.000000000 +0900 -+++ lib/Mail/SpamAssassin/HTML.pm 2015-08-30 00:46:40.902000000 +0900 -@@ -695,7 +695,8 @@ - } - else { - # NBSP: UTF-8: C2 A0, ISO-8859-*: A0 -- $text =~ s/[ \t\n\r\f\x0b]+|\xc2\xa0/ /gs; -+ # Ideographic Space: UTF-8: E3 80 80 -+ $text =~ s/[ \t\n\r\f\x0b]+|(?:\xc2\xa0)+|(?:\xe3\x80\x80)+/ /gs; - # trim leading whitespace if previous element was whitespace - # and current element is not invisible - if (@{ $self->{text} } && !$display{invisible} && -@@ -742,7 +743,8 @@ - my $invisible_for_bayes = 0; - - # NBSP: UTF-8: C2 A0, ISO-8859-*: A0 -- if ($text !~ /^(?:[ \t\n\r\f\x0b]|\xc2\xa0)*\z/s) { -+ # Ideographic Space: UTF-8: E3 80 80 -+ if ($text !~ /^(?:[ \t\n\r\f\x0b]|\xc2\xa0|\xe3\x80\x80)*\z/s) { - $invisible_for_bayes = $self->html_font_invisible($text); - } - ---- lib/Mail/SpamAssassin/Message/Node.pm 2015-04-29 04:56:48.000000000 +0900 -+++ lib/Mail/SpamAssassin/Message/Node.pm 2015-08-30 00:25:32.534000000 +0900 -@@ -44,6 +44,7 @@ - use Mail::SpamAssassin::Constants qw(:sa); - use Mail::SpamAssassin::HTML; - use Mail::SpamAssassin::Logger; -+use Mail::SpamAssassin::Util::Charset; - - our($enc_utf8, $enc_w1252, $have_encode_detector); - BEGIN { -@@ -407,6 +408,10 @@ - - return $_[1] unless $self->{normalize} && $enc_utf8; - -+ # FIXME: to be merged. -+ my ($decoded_data, $charset_detected) = normalize_charset($_[1], $charset_declared, $return_decoded); -+ return wantarray ? ($decoded_data, $charset_detected) : $decoded_data; -+ - warn "message: _normalize() was given characters, expected bytes: $_[1]\n" - if utf8::is_utf8($_[1]); - -@@ -603,6 +608,7 @@ - - my $text = $self->decode; # QP and Base64 decoding, bytes - my $text_len = length($text); # num of bytes in original charset encoding -+ my $charset; - - # render text/html always, or any other text|text/plain part as text/html - # based on a heuristic which simulates a certain common mail client -@@ -622,7 +628,9 @@ - # subroutine _normalize() to return Unicode text. See Bug 7133 - # - $character_semantics = 1; # $text will be in characters -- $text = $self->_normalize($text, $self->{charset}, 1); # bytes to chars -+ ($text, $charset) = $self->_normalize($text, $self->{charset}, 1); # bytes to chars -+ $self->{charset} = $charset; -+ $self->{language} = get_language($text, $charset); - } elsif (!defined $self->{charset} || - $self->{charset} =~ /^(?:US-ASCII|UTF-8)\z/i) { - # With some luck input can be interpreted as UTF-8, do not warn. -@@ -657,7 +665,9 @@ - else { # plain text - if ($self->{normalize} && $enc_utf8) { - # request transcoded result as UTF-8 octets! -- $text = $self->_normalize($text, $self->{charset}, 0); -+ ($text, $charset) = $self->_normalize($text, $self->{charset}, 0); -+ $self->{charset} = $charset; -+ $self->{language} = get_language($text, $charset); - } - $self->{rendered_type} = $self->{type}; - $self->{rendered} = $self->{'visible_rendered'} = $text; ---- lib/Mail/SpamAssassin/Message.pm 2015-04-29 04:56:49.000000000 +0900 -+++ lib/Mail/SpamAssassin/Message.pm 2015-08-30 00:52:32.210000000 +0900 -@@ -627,6 +627,8 @@ - delete $self->{'pristine_headers'}; - delete $self->{'line_ending'}; - delete $self->{'missing_head_body_separator'}; -+ delete $self->{'charset'}; -+ delete $self->{'language'}; - - my @toclean = ( $self ); - -@@ -653,6 +655,8 @@ - delete $part->{'invisible_rendered'}; - delete $part->{'type'}; - delete $part->{'rendered_type'}; -+ delete $self->{'charset'}; -+ delete $self->{'language'}; - - # if there are children nodes, add them to the queue of nodes to clean up - if (exists $part->{'body_parts'}) { -@@ -1143,6 +1147,9 @@ - # whitespace handling (warning: small changes have large effects!) - $text =~ s/\n+\s*\n+/\f/gs; # double newlines => form feed - # $text =~ tr/ \t\n\r\x0b\xa0/ /s; # whitespace (incl. VT, NBSP) => space -+ if ($self->{normalize}) { -+ $text =~ s/\xc2\xa0|\xe3\x80\x80/ /g; # whitespace (NBSP, ideographic space) => space -+ } - $text =~ tr/ \t\n\r\x0b/ /s; # whitespace (incl. VT) => space - $text =~ tr/\f/\n/; # form feeds => newline - -@@ -1235,6 +1242,27 @@ - } - - # --------------------------------------------------------------------------- -+ -+sub get_language { -+ my ($self) = @_; -+ -+ if (defined $self->{language}) { return $self->{language}; } -+ my @parts = $self->find_parts(qr/^(?:text|message)\b/i,1); -+ return '' unless @parts; -+ -+ # Go through each part -+ my @langs; -+ for(my $pt = 0 ; $pt <= $#parts ; $pt++ ) { -+ my $p = $parts[$pt]; -+ my $lang = $p->{language}; -+ next unless ($lang); -+ push(@langs, $lang) unless (grep(/^$lang$/, @langs)) -+ } -+ $self->{language} = scalar(@langs) ? join(' ', @langs) : ''; -+ return $self->{language}; -+} -+ -+# --------------------------------------------------------------------------- - - 1; - ---- lib/Mail/SpamAssassin/PerMsgStatus.pm 2015-04-29 04:56:49.000000000 +0900 -+++ lib/Mail/SpamAssassin/PerMsgStatus.pm 2015-08-30 00:55:35.583000000 +0900 -@@ -55,6 +55,7 @@ - - use Errno qw(ENOENT); - use Time::HiRes qw(time); -+use Encode; - - use Mail::SpamAssassin::Constants qw(:sa); - use Mail::SpamAssassin::AsyncLoop; -@@ -1053,12 +1054,32 @@ - # the SpamAssassin report - my $report = $self->get_report(); - -- # If there are any wide characters, need to MIME-encode in UTF-8 -- # TODO: If $report_charset is something other than iso-8859-1/us-ascii, then -- # we could try converting to that charset if possible -- unless ($] < 5.008 || utf8::downgrade($report, 1)) { -+ # decode to utf-8. -+ my $is_utf8 = 0; -+ if ($self->{conf}->{normalize_charset}) { -+ $report = Encode::decode_utf8($report); -+ $is_utf8 = 1; -+ } -+ else { -+ if ($self->{msg}->{charset}) { -+ eval { -+ my $scratch = $report; -+ $report = Encode::decode($self->{msg}->{charset},$scratch,Encode::FB_CROAK); -+ $is_utf8 = 1; -+ }; -+ } -+ } -+ # encode to report_charset. encode to utf-8 if charset conversion fail. -+ if ($is_utf8) { -+ eval { -+ my $scratch = $report; -+ $report = Encode::encode($self->{conf}->{report_charset},$scratch,Encode::FB_CROAK); -+ $is_utf8 = 0; -+ }; -+ if ($is_utf8) { -+ $report = Encode::encode_utf8($report); - $report_charset = "; charset=utf-8"; -- utf8::encode($report); -+ } - } - - # get original headers, "pristine" if we can do it ---- lib/Mail/SpamAssassin/Plugin/Bayes.pm 2015-04-29 04:56:47.000000000 +0900 -+++ lib/Mail/SpamAssassin/Plugin/Bayes.pm 2015-08-30 00:25:43.443000000 +0900 -@@ -70,6 +70,7 @@ - $MARK_PRESENCE_ONLY_HDRS - %HEADER_NAME_COMPRESSION - $OPPORTUNISTIC_LOCK_VALID -+ $SKIP_UTF8_SHORT_TOKENS_RE - }; - - # Which headers should we scan for tokens? Don't use all of them, as it's easy -@@ -226,6 +227,15 @@ - # will require a longer token than English ones.) - use constant MAX_TOKEN_LENGTH => 15; - -+# Skip if a token is too short. -+$SKIP_UTF8_SHORT_TOKENS_RE = qr{(?: -+ [\x00-\x7F] # 1 byte -+ | [\xC0-\xDF][\x80-\xBF] # 2 bytes -+ | [\xE0-\xEF][\x80-\xBF]{2} # 3 bytes -+ | [\xF0-\xF7][\x80-\xBF]{3} # 4 bytes -+ | (?:\xE3[\x81-\x83][\x80-\xBF]){2} # 2 characters of Hiragana and Katakana -+)}x; -+ - ########################################################################### - - sub new { -@@ -1048,9 +1058,28 @@ - $pms->{msg}->get_mimepart_digests() if $t_src->{mimepart}; - @{$msgdata->{bayes_token_uris}} = - $pms->get_uri_list() if $t_src->{uri}; -+ if ($self->{conf}->{normalize_charset}) { -+ my $tokenizer = $self->get_tokenizer($pms); -+ if (ref($tokenizer)) { -+ $msgdata->{bayes_token_body} = $tokenizer->tokenize($msgdata->{bayes_token_body}); -+ $msgdata->{bayes_token_inviz} = $tokenizer->tokenize($msgdata->{bayes_token_inviz}); -+ } -+ } - return $msgdata; - } - -+sub get_tokenizer { -+ my ($self, $msg) = @_; -+ -+ my $tokenizer; -+ my @languages = split(/\s+/, $msg->{msg}->get_language()); -+ foreach my $lang (@languages) { -+ $tokenizer = $self->{'conf'}->{'tokenizer'}->{$lang}; -+ last if (ref($tokenizer)); -+ } -+ return $tokenizer; -+} -+ - ########################################################################### - - # The calling functions expect a uniq'ed array of tokens ... -@@ -1192,6 +1221,11 @@ - next if $len < 3 || - ($token =~ /^(?:a(?:ble|l(?:ready|l)|n[dy]|re)|b(?:ecause|oth)|c(?:an|ome)|e(?:ach|mail|ven)|f(?:ew|irst|or|rom)|give|h(?:a(?:ve|s)|ttp)|i(?:n(?:formation|to)|t\'s)|just|know|l(?:ike|o(?:ng|ok))|m(?:a(?:de|il(?:(?:ing|to))?|ke|ny)|o(?:re|st)|uch)|n(?:eed|o[tw]|umber)|o(?:ff|n(?:ly|e)|ut|wn)|p(?:eople|lace)|right|s(?:ame|ee|uch)|t(?:h(?:at|is|rough|e)|ime)|using|w(?:eb|h(?:ere|y)|ith(?:out)?|or(?:ld|k))|y(?:ears?|ou(?:(?:\'re|r))?))$/i); - -+ # Skip short UTF-8 tokens. -+ if ($self->{conf}->{normalize_charset}) { -+ next if ($token =~ /^$SKIP_UTF8_SHORT_TOKENS_RE$/o); -+ } -+ - # are we in the body? If so, apply some body-specific breakouts - if ($region == 1 || $region == 2) { - if (CHEW_BODY_MAILADDRS && $token =~ /\S\@\S/i) { -@@ -1222,14 +1256,16 @@ - } - } - -- if (TOKENIZE_LONG_8BIT_SEQS_AS_TUPLES && $token =~ /[\xa0-\xff]{2}/) { -- # Matt sez: "Could be asian? Autrijus suggested doing character ngrams, -- # but I'm doing tuples to keep the dbs small(er)." Sounds like a plan -- # to me! (jm) -- while ($token =~ s/^(..?)//) { -- push (@rettokens, "8:$1"); -+ unless ($self->{conf}->{normalize_charset}) { -+ if (TOKENIZE_LONG_8BIT_SEQS_AS_TUPLES && $token =~ /[\xa0-\xff]{2}/) { -+ # Matt sez: "Could be asian? Autrijus suggested doing character ngrams, -+ # but I'm doing tuples to keep the dbs small(er)." Sounds like a plan -+ # to me! (jm) -+ while ($token =~ s/^(..?)//) { -+ push (@rettokens, "8:$1"); -+ } -+ next; - } -- next; - } - - if (($region == 0 && HDRS_TOKENIZE_LONG_TOKENS_AS_SKIPS) ---- lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm 1970-01-01 09:00:00.000000000 +0900 -+++ lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm 2015-08-30 00:25:32.537000000 +0900 -@@ -0,0 +1,84 @@ -+# <@LICENSE> -+# Copyright 2004 Apache Software Foundation -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# </@LICENSE> -+ -+=head1 NAME -+ -+Tokenizer::MeCab - Japanese tokenizer with MeCab -+ -+=head1 SYNOPSIS -+ -+loadplugin Mail::SpamAssassin::Plugin::Tokenizer::MeCab -+ -+=head1 DESCRIPTION -+ -+This plugin tokenizes a Japanese string with MeCab that is -+the morphological analysis engine. -+ -+Text::MeCab 0.12 or over is required. -+ -+=cut -+ -+package Mail::SpamAssassin::Plugin::Tokenizer::MeCab; -+ -+use strict; -+use warnings; -+use Mail::SpamAssassin::Plugin::Tokenizer; -+ -+use vars qw(@ISA); -+@ISA = qw(Mail::SpamAssassin::Plugin::Tokenizer); -+ -+# Have to do this so that RPM doesn't find these as required perl modules -+BEGIN { require MeCab; } -+our $language = 'ja'; -+our $mecab = new MeCab::Tagger(-Ochasen); -+ -+sub new { -+ my $class = shift; -+ my $mailsaobject = shift; -+ -+ $class = ref($class) || $class; -+ my $self = $class->SUPER::new($mailsaobject, $language); -+ bless ($self, $class); -+ -+ return $self; -+} -+ -+sub tokenize { -+ my $self = shift; -+ my $text_array = shift; -+ -+ my @tokenized_array; -+ foreach my $text (@$text_array) { -+ next unless ($text); -+ $text =~ s/([\x80-\xFF]{3,})/&_tokenize($1)/eg; -+ push(@tokenized_array, $text); -+ } -+ return \@tokenized_array; -+} -+ -+sub _tokenize { -+ my $text = shift; -+ -+ my @buf; -+ for (my $node = $mecab->parseToNode($text); $node->{next}; $node = $node->{next}) { -+ push(@buf, $node->{surface}); -+ } -+ my $tokenized = join(' ', @buf) . ' '; -+ return $tokenized; -+} -+ -+1; -+ ---- lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm 1970-01-01 09:00:00.000000000 +0900 -+++ lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm 2015-08-30 00:25:32.538000000 +0900 -@@ -0,0 +1,111 @@ -+# <@LICENSE> -+# Copyright 2004 Apache Software Foundation -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# </@LICENSE> -+ -+=head1 NAME -+ -+Tokenizer::SimpleJA - simple Japanese tokenizer -+ -+=head1 SYNOPSIS -+ -+loadplugin Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA -+ -+=head1 DESCRIPTION -+ -+This plugin simply tokenizes a Japanese string by characters other than -+the alphabet, the Chinese character, and the katakana. -+ -+=cut -+ -+package Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA; -+ -+use strict; -+use warnings; -+use Mail::SpamAssassin::Plugin::Tokenizer; -+ -+use vars qw(@ISA); -+@ISA = qw(Mail::SpamAssassin::Plugin::Tokenizer); -+ -+our $language = 'ja'; -+ -+our $RE = qr{( -+ # Hiragana -+ (?: -+ \xE3\x81[\x80-\xBF] -+ | \xE3\x82[\x80-\x9F] -+ )+ -+ # Katakana -+ | (?: -+ \xE3\x82[\xA0-\xBF] -+ | \xE3\x83[\x80-\xBF] -+ )+ -+ # Kanji -+ | (?: -+ \xE3[\x90-\xBF][\x80-\xBF] -+ | [\xE4-\xE9][\x80-\xBF]{2} -+ | \xEF[\xA4-\xAB][\x80-\xBF] -+ )+ -+ # Fullwidth -+ | (?: -+ \xEF\xBC[\x80-\xBF] -+ | \xEF\xBD[\x80-\x9F] -+ )+ -+ # Others -+ | [\xC0-\xDF][\x80-\xBF] -+ | [\xE0-\xE2][\x80-\xBF]{2} -+ | \xE3\x80[\x80-\xBF] -+ | \xE3[\x84-\x8F][\x80-\xBF] -+ | [\xEA-\xEE][\x80-\xBF]{2} -+ | \xEF[\x80-\xA3][\x80-\xBF] -+ | \xEF[\xAC-\xBB][\x80-\xBF] -+ | \xEF\xBD[\xA0-\xBF] -+ | \xEF[\xBE-\xBF][\x80-\xBF] -+ | [\xF0-\xF7][\x80-\xBF]{3} -+)}x; -+ -+sub new { -+ my $class = shift; -+ my $mailsaobject = shift; -+ -+ $class = ref($class) || $class; -+ my $self = $class->SUPER::new($mailsaobject, $language); -+ bless ($self, $class); -+ -+ return $self; -+} -+ -+sub tokenize { -+ my $self = shift; -+ my $text_array = shift; -+ -+ my @tokenized_array; -+ foreach my $text (@$text_array) { -+ next unless ($text); -+ $text =~ s/([\x80-\xFF]{3,})/&_tokenize($1)/eg; -+ push(@tokenized_array, $text); -+ } -+ return \@tokenized_array; -+} -+ -+sub _tokenize { -+ my $text = shift; -+ -+ $text =~ s/$RE/$1 /og; -+ $text = ' ' . $text; -+ return $text; -+} -+ -+1; -+ ---- lib/Mail/SpamAssassin/Plugin/Tokenizer.pm 1970-01-01 09:00:00.000000000 +0900 -+++ lib/Mail/SpamAssassin/Plugin/Tokenizer.pm 2015-08-30 00:25:32.538000000 +0900 -@@ -0,0 +1,115 @@ -+# <@LICENSE> -+# Copyright 2004 Apache Software Foundation -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# </@LICENSE> -+ -+=head1 NAME -+ -+Mail::SpamAssassin::Plugin::Tokenizer - Tokenizer plugin base class -+ -+=head1 SYNOPSIS -+ -+=head2 SpamAssassin configuration: -+ -+ loadplugin MyTokenizerPlugin /path/to/MyTokenizerPlugin.pm -+ -+=head2 Perl code: -+ -+ use Mail::SpamAssassin::Plugin::Tokenizer; -+ use vars qw(@ISA); -+ @ISA = qw(Mail::SpamAssassin::Plugin::Tokenizer); -+ # language to use this plugin -+ our $language = 'ja'; -+ -+ # constructor: register language -+ sub new { -+ my $class = shift; -+ my $mailsaobject = shift; -+ -+ # some boilerplate... -+ $class = ref($class) || $class; -+ my $self = $class->SUPER::new($mailsaobject, $language); -+ bless ($self, $class); -+ -+ return $self; -+ } -+ -+ # tokenize function -+ sub tokenize { -+ my $self = shift; -+ my $text_array_ref = shift; -+ -+ ...... -+ -+ return $tokenized_array_ref; -+ } -+ -+ -+=head1 DESCRIPTION -+ -+This plugin is the base class of tokenizer plugin. -+You must define tokenize() and $language -+ -+=head1 INTERFACE -+ -+ sub tokenize { -+ my $self = shift; -+ my $text_array_ref = shift; -+ -+ ...... -+ -+ return $tokenized_array_ref; -+ } -+ -+=cut -+ -+package Mail::SpamAssassin::Plugin::Tokenizer; -+ -+use Mail::SpamAssassin::Plugin; -+use Mail::SpamAssassin::Logger; -+use strict; -+use warnings; -+use bytes; -+ -+use vars qw(@ISA); -+@ISA = qw(Mail::SpamAssassin::Plugin); -+ -+sub new { -+ my $class = shift; -+ my $mailsaobject = shift; -+ my $language = shift; -+ -+ # some boilerplate... -+ $class = ref($class) || $class; -+ my $self = $class->SUPER::new($mailsaobject); -+ bless ($self, $class); -+ -+ if ($language) { -+ $self->{main}->{conf}->{tokenizer}->{$language} = $self; -+ } -+ else { -+ dbg("plugin: $self: \$language is not defined"); -+ } -+ -+ return $self; -+} -+ -+sub tokenize { -+ my ($self, $ref) = @_; -+ -+ return $ref; -+} -+ -+1; -+ ---- lib/Mail/SpamAssassin/Util/Charset.pm 1970-01-01 09:00:00.000000000 +0900 -+++ lib/Mail/SpamAssassin/Util/Charset.pm 2015-08-30 00:25:32.539000000 +0900 -@@ -0,0 +1,473 @@ -+# <@LICENSE> -+# Copyright 2006 Apache Software Foundation -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# </@LICENSE> -+ -+ -+=head1 NAME -+ -+ Mail::SpamAssassin::Util::Charset.pm - Utility for charset and language -+ -+=head1 SYNOPSIS -+ -+ my ($decoded, $detected) = Mail::SpamAssassin::Util::Charset::normalize_charset($str, $charset); -+ my $language = Mail::SpamAssassin::Util::Charset::get_language($str, $charset); -+ -+=head1 DESCRIPTION -+ -+This module implements utility methods for charset and language. -+ -+=cut -+ -+package Mail::SpamAssassin::Util::Charset; -+ -+use strict; -+use warnings; -+use Encode; -+use Encode::Guess; -+use Encode::Alias; -+ -+use vars qw ( -+ @ISA @EXPORT -+); -+ -+require Exporter; -+ -+@ISA = qw(Exporter); -+@EXPORT = qw(normalize_charset get_language); -+ -+########################################################################### -+ -+use constant HAS_ENCODE_DETECT => eval { require Encode::Detect::Detector; }; -+use constant HAS_ENCODE_HANEXTRA => eval { require Encode::HanExtra; }; -+use constant HAS_ENCODE_EUCJPMS => eval { require Encode::EUCJPMS; }; -+ -+########################################################################### -+ -+our $KANA_HAN_RE = qr{ -+ # Hiragana and Katakana -+ \xE3[\x81-\x83][\x80-\xBF] -+ # Han -+ | \xE3[\x90-\xBF][\x80-\xBF] -+ | [\xE4-\xE9][\x80-\xBF]{2} -+ | \xEF[\xA4-\xAB][\x80-\xBF] -+}x; -+ -+our %enc2lang; -+our %lang2enc; -+our %scr2lang; -+our %cjkscr2lang; -+our @scrorder; -+ -+BEGIN { -+ -+ # See the following URL about this map: -+ # http://czyborra.com/charsets/iso8859.html -+ # http://czyborra.com/charsets/codepages.html -+ # http://czyborra.com/charsets/cyrillic.html -+ # http://en.wikipedia.org/wiki/ISO_8859 -+ # http://www.w3.org/International/O-charset-lang.html -+ %enc2lang = ( -+ # buint-in Encodings and Encode::Byte -+ # N. America -+ 'ascii' => 'en', -+ 'cp437' => 'en', -+ 'cp863' => 'weurope', -+ -+ # W. Europe (Latin1, Latin9) -+ # fr es ca eu pt it sq rm nl de da sv no fi fo is ga gd en af -+ 'iso-8859-1' => 'weurope', -+ 'iso-8859-15' => 'weurope', -+ 'cp850' => 'weurope', -+ 'cp860' => 'weurope', -+ 'cp1252' => 'weurope', -+ 'MacRoman' => 'weurope', -+ -+ # Cntrl. Europe / Latin2 / Latin10 -+ # hr cs hu pl sr sk sl -+ 'iso-8859-2' => 'ceurope', -+ 'cp852' => 'ceurope', -+ 'cp1250' => 'ceurope', -+ 'MacCentralEurRoman' => 'ceurope', -+ 'MacCroatian' => 'ceurope', -+ 'iso-8859-16' => 'ceurope', -+ 'MacRomanian' => 'ceurope', -+ -+ # Latin3 (Esperanto, Maltese, and Turkish. Turkish is now on 8859-9.) -+ # eo mt -+ 'iso-8859-3' => 'seurope', -+ -+ # Baltics (Latin4, Latin7) -+ # lv lt -+ 'iso-8859-4' => 'neurope', -+ 'iso-8859-13' => 'baltic', -+ 'cp1257' => 'baltic', -+ -+ # Nordics (Latin6) -+ # et kl iu se -+ 'iso-8859-10' => 'nordic', -+ -+ # Cyrillics -+ # bg be uk sr mk ru -+ 'iso-8859-5' => 'ru', -+ 'cp855' => 'ru', -+ 'cp1251' => 'ru', -+ 'cp866' => 'ru', -+ 'MacCyrillic' => 'ru', -+ 'koi8-r' => 'ru', -+ 'MacUkrainian' => 'uk', -+ 'koi8-u' => 'uk', -+ -+ # Arabic -+ 'iso-8859-6' => 'ar', -+ 'cp864' => 'ar', -+ 'cp1256' => 'ar', -+ 'MacArabic' => 'ar', -+ 'cp1006' => 'fa', -+ 'MacFarsi' => 'fa', -+ -+ # Greek -+ 'iso-8859-7' => 'el', -+ 'cp1253' => 'el', -+ 'MacGreek' => 'el', -+ -+ # Hebrew -+ # he yi -+ 'iso-8859-8' => 'he', -+ 'cp862' => 'he', -+ 'cp1255' => 'he', -+ 'MacHebrew' => 'he', -+ -+ # Turkish -+ 'iso-8859-9' => 'tr', -+ 'cp857' => 'tr', -+ 'cp1254' => 'tr', -+ 'MacTurkish' => 'tr', -+ -+ # Thai -+ 'iso-8859-11' => 'th', -+ 'cp874' => 'th', -+ -+ # Celtics (Latin8) -+ # gd cy br -+ 'iso-8859-14' => 'celtic', -+ -+ # Vietnamese -+ 'viscii' => 'vi', -+ 'cp1258' => 'vi', -+ -+ # Encode::CN -+ 'euc-cn' => 'zh', -+ 'cp936' => 'zh', -+ 'hz' => 'zh', -+ -+ # Encode::TW -+ 'big5-eten' => 'zh', -+ 'big5-hkscs' => 'zh', -+ 'cp950' => 'zh', -+ -+ # Encode::JP -+ 'euc-jp' => 'ja', -+ 'shiftjis' => 'ja', -+ '7bit-jis' => 'ja', -+ 'iso-2022-jp' => 'ja', -+ 'iso-2022-jp-1' => 'ja', -+ 'cp932' => 'ja', -+ -+ # Encode::KR -+ 'euc-kr' => 'ko', -+ 'cp949' => 'ko', -+ 'johab' => 'ko', -+ 'iso-2022-kr' => 'ko', -+ -+ # Encode::HanExtra -+ 'euc-tw' => 'zh', -+ 'gb18030' => 'zh', -+ -+ # Encode::JIS2K -+ 'euc-jisx0213' => 'ja', -+ 'shiftjisx0123' => 'ja', -+ 'iso-2022-jp-3' => 'ja', -+ -+ # Encode::EUCJPMS -+ 'eucJP-ms' => 'ja', -+ 'cp51932' => 'ja', -+ 'cp50220' => 'ja', -+ 'cp50221' => 'ja', -+ -+ ); -+ -+ %lang2enc = ( -+ # Latin1 -+ 'en' => ['ascii'], -+ 'weurope' => ['cp1252'], -+ -+ # Latin2 -+ 'ceurope' => ['cp1250'], -+ -+ # Latin3 -+ 'seurope' => ['iso-8859-3'], -+ -+ # Latin4 -+ 'neurope' => ['iso-8859-4'], -+ -+ # Latin5 -+ 'tr' => ['cp1254'], -+ -+ # Latin6 -+ 'nordic' => ['iso-8859-10'], -+ -+ # Latin7 -+ 'baltic' => ['cp1257'], -+ -+ # Latin8 -+ 'celtic' => ['iso-8859-14'], -+ -+ # Non Latin -+ 'ru' => ['koi8-r', 'cp1251'], -+ 'uk' => ['koi8-u'], -+ -+ 'ar' => ['cp1256'], -+ 'el' => ['cp1253'], -+ 'he' => ['cp1255'], -+ 'th' => ['cp874'], -+ 'vi' => ['viscii', 'cp1258'], -+ 'zh' => ['euc-cn', 'cp950'], -+ 'ja' => ['euc-jp', 'cp932'], -+ 'ko' => ['euc-kr', 'cp949'], -+ -+ ); -+ -+ %scr2lang = ( -+ 'InLatin1Supplement' => ['weurope'], -+ 'InLatinExtendedA' => [ -+ 'ceurope', -+ 'seurope', -+ 'tr', -+ 'vi' -+ ], -+ 'InLatinExtendedB' => [ -+ 'nordic', -+ 'baltic', -+ 'celtic' -+ ], -+ 'Thai' => ['th'], -+ 'Cyrillic' => ['ru', 'uk'], -+ 'Arabic' => ['ar'], -+ 'Greek' => ['el'], -+ 'Hebrew' => ['he'], -+ ); -+ -+ # better detection for CJK -+ @scrorder = ('Hiragana','Katakana','Hangul','Han',keys(%scr2lang)); -+ %cjkscr2lang = ( -+ 'Hiragana' => ['ja'], -+ 'Katakana' => ['ja'], -+ 'Hangul' => ['ko'], -+ 'Han' => ['zh', 'ja', 'ko'], -+ ); -+ -+ unless (HAS_ENCODE_HANEXTRA) { -+ Encode::Alias::define_alias( qr/^gb18030$/i => ' "euc-cn"' ); -+ } -+ Encode::Alias::define_alias( qr/^unicode-1-1-(.+)$/i => ' "$1"' ); -+ Encode::Alias::define_alias( qr/^TIS-620$/i => ' "iso-8859-11"' ); -+ Encode::Alias::define_alias( qr/^x-mac-(.+)$/i => ' "Mac$1"' ); -+ Encode::Alias::define_alias( qr/^Shift_JIS$/i => ' "cp932"' ); -+ if (HAS_ENCODE_EUCJPMS) { -+ Encode::Alias::define_alias( qr/^iso-2022-jp$/i => ' "cp50221"' ); -+ Encode::Alias::define_alias( qr/^euc-jp$/i => ' "cp51932"' ); -+ } -+} -+ -+sub get_language { -+ my $str = shift; # $str must be UTF-8 encoding -+ my $charset = shift; -+ -+ return 'en' unless $charset; -+ if ($charset !~ /^utf/i) { -+ return $enc2lang{$charset}; -+ } elsif (defined($str)) { -+ $str =~ s/[\x00-\x7F]//g; # remove ASCII characters -+ return 'en' if ($str eq ''); -+ -+ my %handled; -+ $str = Encode::decode_utf8($str) unless (Encode::is_utf8($str)); -+ foreach my $scr (@scrorder) { -+ next if ($str !~ /\p{$scr}/); -+ my $scrlangs = exists($cjkscr2lang{$scr}) ? $cjkscr2lang{$scr} : $scr2lang{$scr}; -+ foreach my $lang (@$scrlangs) { -+ next if (exists($handled{$lang})); -+ foreach my $enc (@{$lang2enc{$lang}}) { -+ my $scratch = $str; -+ Encode::encode($enc, $scratch, Encode::FB_QUIET); -+ return $lang if ($scratch eq ''); -+ } -+ $handled{$lang} = 1; -+ } -+ } -+ } -+ return 'en'; -+} -+ -+# TEST 1: try conversion to use the specified charset. -+# TEST 2: try conversion to use Encode::Detect. -+# TEST 3: try conversion to use Encode::Guess. -+sub normalize_charset { -+ my $str = shift; -+ my $charset = shift; -+ my $return_decoded = shift; -+ -+ return wantarray ? ($str, 'ascii') : $str unless ($str); -+ -+ my $decoded; -+ my $detected; -+ -+ if ($charset) { -+ ($decoded, $detected) = _specified_encoding($str, $charset); -+ } -+ unless ($detected) { -+ ($decoded, $detected) = _encode_detect($str); -+ } -+ unless ($detected) { -+ ($decoded, $detected) = _encode_guess($str); -+ } -+ unless ($detected) { -+ return ($str, undef); -+ } -+ $decoded =~ s/^\x{feff}//g; -+ $decoded = Encode::encode_utf8($decoded) if $return_decoded; -+ -+ # unfold hiragana, katakana and han -+ if ($detected =~ /^(?:UTF|EUC|BIG5|GB|SHIFTJIS|ISO-2022|CP969$|CP932$|CP949$|CP50220|CP50221$)/i) { -+ $decoded =~ s/($KANA_HAN_RE)\012($KANA_HAN_RE)/$1$2/og; -+ } -+ return wantarray ? ($decoded, $detected) : $decoded; -+} -+ -+sub _specified_encoding { -+ my $str = shift; -+ my $encoding = shift; -+ -+ my $detected; -+ my $decoded; -+ -+ return (undef, undef) unless ($encoding); -+ -+ # note: ISO-2022-* is not deistinguish from US-ASCII -+ return (undef, undef) if ($str =~ /\e/ and $encoding !~ /^ISO-2022/i); -+ -+ # UTF-16|32 encoding without BOM cannot be trusted. -+ return (undef, undef) if ($encoding =~ /^UTF-32$/i and $str !~ /^(?:\xFF\xFE\x00\x00|\x00\x00\xFE\xFF)/); -+ return (undef, undef) if ($encoding =~ /^UTF-16$/i and $str !~ /^(?:\xFF\xFE|\xFE\xFF)/); -+ -+ $encoding = _get_alias($encoding); -+ my $encoder = Encode::find_encoding($encoding); -+ if (ref($encoder)) { -+ $decoded = $encoder->decode($str,Encode::FB_QUIET); -+ $detected = $encoder->name if ($str eq ''); -+ } -+ return ($decoded, $detected); -+} -+ -+sub _encode_detect { -+ return undef unless HAS_ENCODE_DETECT; -+ my $str = shift; -+ -+ # UTF-16|32 encoding without BOM cannot be trusted. -+ return (undef, undef) if ($str =~ /\x00\x00/ and $str !~ /^(?:\xFF\xFE\x00\x00|\x00\x00\xFE\xFF)/); -+ return (undef, undef) if ($str =~ /\x00/ and $str !~ /^(?:\xFF\xFE|\xFE\xFF)/); -+ -+ my $decoded; -+ my $detected = Encode::Detect::Detector::detect($str); -+ if ($detected) { -+ $detected = _get_alias($detected); -+ my $encoder = Encode::find_encoding($detected); -+ if (ref($encoder)) { -+ $decoded = $encoder->decode($str); -+ $detected = $decoded ? $encoder->name : undef; -+ } -+ else { -+ $detected = undef; -+ } -+ } -+ return ($decoded, $detected); -+} -+ -+sub _encode_guess { -+ my $str = shift; -+ -+ my $detected; -+ my $decoded; -+ my $encoder; -+ -+ # Step 1: Examine ISO-2022-*. -+ if ($str =~ /\e/) { -+ $Encode::Guess::NoUTFAutoGuess = 1; -+ $encoder = Encode::Guess::guess_encoding($str, -+ qw/cp50221 7bit-jis iso-2022-kr/); -+ $Encode::Guess::NoUTFAutoGuess = 0; -+ } -+ -+ # Step 2: Examine US-ASCII/UTF-(8|16|32) -+ unless (ref($encoder)) { -+ $Encode::Guess::NoUTFAutoGuess = 0; -+ $encoder = Encode::Guess::guess_encoding($str); -+ } -+ -+ # Step 3: Examine other encodings -+ unless (ref($encoder)) { -+ $Encode::Guess::NoUTFAutoGuess = 1; -+ eval { -+ if ($str =~ /[\x80-\xFF]{4}/) { -+ $encoder = Encode::Guess::guess_encoding($str, -+ qw/euc-cn big5-eten euc-jp cp932 euc-kr cp949/); -+ } -+ else { -+ $encoder = Encode::Guess::guess_encoding($str, -+ qw/iso-8859-1 cp1252/); -+ } -+ }; -+ $Encode::Guess::NoUTFAutoGuess = 0; -+ } -+ if (ref($encoder)) { -+ $detected = $encoder->name; -+ if ($detected) { -+ $decoded = $encoder->decode($str); -+ } -+ } -+ return ($decoded, $detected); -+} -+ -+sub _get_alias { -+ my $encoding = shift; -+ -+ unless (HAS_ENCODE_HANEXTRA) { -+ $encoding =~ s/^gb18030$/euc-cn/i; -+ } -+ $encoding =~ s/^unicode-1-1-(.+)$/$1/i; -+ $encoding =~ s/^TIS-620$/iso-8859-11/i; -+ $encoding =~ s/x-mac-(.+)$/Mac$1/i; -+ $encoding =~ s/^Shift_JIS$/cp932/i; -+ if (HAS_ENCODE_EUCJPMS) { -+ $encoding =~ s/^iso-2022-jp$/cp50221/i; -+ $encoding =~ s/^euc-jp$/cp51932/i; -+ } -+ -+ return $encoding; -+} -+ -+ -+1; -+ diff --git a/japanese/spamassassin/files/spamassassin-ja.plist b/japanese/spamassassin/files/spamassassin-ja.plist deleted file mode 100644 index acfde3df93a1..000000000000 --- a/japanese/spamassassin/files/spamassassin-ja.plist +++ /dev/null @@ -1,9 +0,0 @@ -%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm -%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm -%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer.pm -%%SITE_PERL%%/Mail/SpamAssassin/Util/Charset.pm -%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer.3.gz -%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer::MeCab.3.gz -%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA.3.gz -%%PERL5_MAN3%%/Mail::SpamAssassin::Util::Charset.3.gz -@sample %%ETCDIR%%/%%TOKENIZER_PRE%%.sample diff --git a/japanese/spamassassin/files/tokenizer.pre b/japanese/spamassassin/files/tokenizer.pre deleted file mode 100644 index d21410bbadc9..000000000000 --- a/japanese/spamassassin/files/tokenizer.pre +++ /dev/null @@ -1,8 +0,0 @@ - -# Tokenizer::SimpleJA -# -loadplugin Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA - -# Tokenizer::MeCab -# -#loadplugin Mail::SpamAssassin::Plugin::Tokenizer::MeCab diff --git a/japanese/spamassassin/pkg-message b/japanese/spamassassin/pkg-message deleted file mode 100644 index 49cea24cb5a8..000000000000 --- a/japanese/spamassassin/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ - -************************************************************************ -For Japanese users, see documents in -http://emaillab.jp/spamassassin/ja-patch/ - -Tokenizer::MeCab uses UTF-8 encoding. You may have to manually -(re)install the following ports with the build options for UTF-8: - japanese/mecab WITH_CHARSET=utf-8 - japanese/mecab-ipadic WITH_CHARSET=utf-8 - japanese/p5-MeCab -************************************************************************ diff --git a/net/Makefile b/net/Makefile index a98def1a67f5..a6cc3cee8703 100644 --- a/net/Makefile +++ b/net/Makefile @@ -422,7 +422,6 @@ SUBDIR += librsync2 SUBDIR += libsignal SUBDIR += libsocket++ - SUBDIR += libsrtp SUBDIR += libsrtp2 SUBDIR += libstorj SUBDIR += libtnl diff --git a/net/libsrtp/Makefile b/net/libsrtp/Makefile deleted file mode 100644 index f90d3b2306cc..000000000000 --- a/net/libsrtp/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Created by: Alexander Brovikov <alexander@brovikov.ru> -# $FreeBSD$ - -PORTNAME= libsrtp -DISTVERSIONPREFIX= v -DISTVERSION= 1.6.0 -PORTREVISION= 2 -CATEGORIES= net - -MAINTAINER= tijl@FreeBSD.org -COMMENT= Secure RTP (SRTP) Reference Implementation - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Superseded by libsrtp2 -EXPIRATION_DATE=2018-12-31 - -PORTSCOUT= limit:^1\. - -USE_GITHUB= yes -GH_ACCOUNT= cisco - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-openssl -USES= cpe localbase gmake pathfix pkgconfig ssl -CPE_VENDOR= cisco -USE_LDCONFIG= yes - -ALL_TARGET= all shared_library -TEST_TARGET= runtest -TEST_ENV= LD_LIBRARY_PATH=${WRKSRC} - -.if ! defined(WITH_DEBUG) -CONFIGURE_ARGS+=--disable-debug -.endif - -post-patch: - @${REINPLACE_CMD} '/pkg-config.*openssl/d' ${WRKSRC}/configure - -.include <bsd.port.mk> diff --git a/net/libsrtp/distinfo b/net/libsrtp/distinfo deleted file mode 100644 index 65dad6613528..000000000000 --- a/net/libsrtp/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1517320244 -SHA256 (cisco-libsrtp-v1.6.0_GH0.tar.gz) = 1a3e7904354d55e45b3c5c024ec0eab1b8fa76fdbf4dd2ea2625dad2b3c6edde -SIZE (cisco-libsrtp-v1.6.0_GH0.tar.gz) = 1648862 diff --git a/net/libsrtp/files/patch-00-84faa63 b/net/libsrtp/files/patch-00-84faa63 deleted file mode 100644 index 0325bbe91e27..000000000000 --- a/net/libsrtp/files/patch-00-84faa63 +++ /dev/null @@ -1,285 +0,0 @@ -Backport of https://github.com/cisco/libsrtp/commit/84faa631a55235f6138cacda2e7f81980a43d13e - ---- crypto/cipher/aes_gcm_ossl.c.orig 2017-08-01 11:57:38 UTC -+++ crypto/cipher/aes_gcm_ossl.c -@@ -85,8 +85,6 @@ extern cipher_type_t aes_gcm_256_openssl; - err_status_t aes_gcm_openssl_alloc (cipher_t **c, int key_len, int tlen) - { - aes_gcm_ctx_t *gcm; -- int tmp; -- uint8_t *allptr; - - debug_print(mod_aes_gcm, "allocating cipher with key length %d", key_len); - debug_print(mod_aes_gcm, "allocating cipher with tag length %d", tlen); -@@ -105,16 +103,22 @@ err_status_t aes_gcm_openssl_alloc (cipher_t **c, int - } - - /* allocate memory a cipher of type aes_gcm */ -- tmp = sizeof(cipher_t) + sizeof(aes_gcm_ctx_t); -- allptr = crypto_alloc(tmp); -- if (allptr == NULL) { -+ *c = (cipher_t *)crypto_alloc(sizeof(cipher_t)); -+ if (*c == NULL) { - return (err_status_alloc_fail); - } -+ memset(*c, 0x0, sizeof(cipher_t)); - -+ gcm = (aes_gcm_ctx_t *)crypto_alloc(sizeof(aes_gcm_ctx_t)); -+ if (gcm == NULL) { -+ crypto_free(*c); -+ *c = NULL; -+ return (err_status_alloc_fail); -+ } -+ memset(gcm, 0x0, sizeof(aes_gcm_ctx_t)); -+ - /* set pointers */ -- *c = (cipher_t*)allptr; -- (*c)->state = allptr + sizeof(cipher_t); -- gcm = (aes_gcm_ctx_t *)(*c)->state; -+ (*c)->state = gcm; - - /* increment ref_count */ - switch (key_len) { -@@ -122,15 +126,15 @@ err_status_t aes_gcm_openssl_alloc (cipher_t **c, int - (*c)->type = &aes_gcm_128_openssl; - (*c)->algorithm = AES_128_GCM; - aes_gcm_128_openssl.ref_count++; -- ((aes_gcm_ctx_t*)(*c)->state)->key_size = AES_128_KEYSIZE; -- ((aes_gcm_ctx_t*)(*c)->state)->tag_len = tlen; -+ gcm->key_size = AES_128_KEYSIZE; -+ gcm->tag_len = tlen; - break; - case AES_256_GCM_KEYSIZE_WSALT: - (*c)->type = &aes_gcm_256_openssl; - (*c)->algorithm = AES_256_GCM; - aes_gcm_256_openssl.ref_count++; -- ((aes_gcm_ctx_t*)(*c)->state)->key_size = AES_256_KEYSIZE; -- ((aes_gcm_ctx_t*)(*c)->state)->tag_len = tlen; -+ gcm->key_size = AES_256_KEYSIZE; -+ gcm->tag_len = tlen; - break; - } - -@@ -164,10 +168,10 @@ err_status_t aes_gcm_openssl_dealloc (cipher_t *c) - return (err_status_dealloc_fail); - break; - } -+ /* zeroize the key material */ -+ octet_string_set_to_zero((uint8_t*)ctx, sizeof(aes_gcm_ctx_t)); -+ crypto_free(ctx); - } -- -- /* zeroize entire state*/ -- octet_string_set_to_zero((uint8_t*)c, sizeof(cipher_t) + sizeof(aes_gcm_ctx_t)); - - /* free memory */ - crypto_free(c); ---- crypto/cipher/aes_icm.c.orig 2017-08-01 11:57:38 UTC -+++ crypto/cipher/aes_icm.c -@@ -95,8 +95,7 @@ debug_module_t mod_aes_icm = { - err_status_t - aes_icm_alloc_ismacryp(cipher_t **c, int key_len, int forIsmacryp) { - extern cipher_type_t aes_icm; -- uint8_t *pointer; -- int tmp; -+ aes_icm_ctx_t *icm; - - debug_print(mod_aes_icm, - "allocating cipher with key length %d", key_len); -@@ -114,13 +113,23 @@ aes_icm_alloc_ismacryp(cipher_t **c, int key_len, int - return err_status_bad_param; - - /* allocate memory a cipher of type aes_icm */ -- tmp = (sizeof(aes_icm_ctx_t) + sizeof(cipher_t)); -- pointer = (uint8_t*)crypto_alloc(tmp); -- if (pointer == NULL) -+ *c = (cipher_t *)crypto_alloc(sizeof(cipher_t)); -+ if (*c == NULL) - return err_status_alloc_fail; - -+ memset(*c, 0x0, sizeof(cipher_t)); -+ -+ icm = (aes_icm_ctx_t *)crypto_alloc(sizeof(aes_icm_ctx_t)); -+ if (icm == NULL) { -+ crypto_free(*c); -+ return err_status_alloc_fail; -+ } -+ memset(icm, 0x0, sizeof(aes_icm_ctx_t)); -+ - /* set pointers */ -- *c = (cipher_t *)pointer; -+ (*c)->state = icm; -+ (*c)->type = &aes_icm; -+ - switch (key_len) { - case 46: - (*c)->algorithm = AES_256_ICM; -@@ -132,13 +141,12 @@ aes_icm_alloc_ismacryp(cipher_t **c, int key_len, int - (*c)->algorithm = AES_128_ICM; - break; - } -- (*c)->type = &aes_icm; -- (*c)->state = pointer + sizeof(cipher_t); - - /* increment ref_count */ - aes_icm.ref_count++; - - /* set key size */ -+ icm->key_size = key_len; - (*c)->key_len = key_len; - - return err_status_ok; -@@ -151,12 +159,20 @@ err_status_t aes_icm_alloc(cipher_t **c, int key_len, - err_status_t - aes_icm_dealloc(cipher_t *c) { - extern cipher_type_t aes_icm; -+ aes_icm_ctx_t *ctx; - -- /* zeroize entire state*/ -- octet_string_set_to_zero((uint8_t *)c, -- sizeof(aes_icm_ctx_t) + sizeof(cipher_t)); -+ if (c == NULL) { -+ return err_status_bad_param; -+ } - -- /* free memory */ -+ ctx = (aes_icm_ctx_t *)c->state; -+ if (ctx) { -+ /* zeroize the key material */ -+ octet_string_set_to_zero((uint8_t*)ctx, sizeof(aes_icm_ctx_t)); -+ crypto_free(ctx); -+ } -+ -+ /* free the cipher context */ - crypto_free(c); - - /* decrement ref_count */ ---- crypto/cipher/aes_icm_ossl.c.orig 2017-08-01 11:57:38 UTC -+++ crypto/cipher/aes_icm_ossl.c -@@ -115,8 +115,6 @@ extern cipher_type_t aes_icm_256; - err_status_t aes_icm_openssl_alloc (cipher_t **c, int key_len, int tlen) - { - aes_icm_ctx_t *icm; -- int tmp; -- uint8_t *allptr; - - debug_print(mod_aes_icm, "allocating cipher with key length %d", key_len); - -@@ -132,16 +130,22 @@ err_status_t aes_icm_openssl_alloc (cipher_t **c, int - } - - /* allocate memory a cipher of type aes_icm */ -- tmp = sizeof(cipher_t) + sizeof(aes_icm_ctx_t); -- allptr = (uint8_t*)crypto_alloc(tmp); -- if (allptr == NULL) { -+ *c = (cipher_t *)crypto_alloc(sizeof(cipher_t)); -+ if (*c == NULL) { - return err_status_alloc_fail; - } -+ memset(*c, 0x0, sizeof(cipher_t)); - -+ icm = (aes_icm_ctx_t *)crypto_alloc(sizeof(aes_icm_ctx_t)); -+ if (icm == NULL) { -+ crypto_free(*c); -+ *c = NULL; -+ return err_status_alloc_fail; -+ } -+ memset(icm, 0x0, sizeof(aes_icm_ctx_t)); -+ - /* set pointers */ -- *c = (cipher_t*)allptr; -- (*c)->state = allptr + sizeof(cipher_t); -- icm = (aes_icm_ctx_t*)(*c)->state; -+ (*c)->state = icm; - - /* increment ref_count */ - switch (key_len) { -@@ -149,21 +153,21 @@ err_status_t aes_icm_openssl_alloc (cipher_t **c, int - (*c)->algorithm = AES_128_ICM; - (*c)->type = &aes_icm; - aes_icm.ref_count++; -- ((aes_icm_ctx_t*)(*c)->state)->key_size = AES_128_KEYSIZE; -+ icm->key_size = AES_128_KEYSIZE; - break; - #ifndef SRTP_NO_AES192 - case AES_192_KEYSIZE_WSALT: - (*c)->algorithm = AES_192_ICM; - (*c)->type = &aes_icm_192; - aes_icm_192.ref_count++; -- ((aes_icm_ctx_t*)(*c)->state)->key_size = AES_192_KEYSIZE; -+ icm->key_size = AES_192_KEYSIZE; - break; - #endif - case AES_256_KEYSIZE_WSALT: - (*c)->algorithm = AES_256_ICM; - (*c)->type = &aes_icm_256; - aes_icm_256.ref_count++; -- ((aes_icm_ctx_t*)(*c)->state)->key_size = AES_256_KEYSIZE; -+ icm->key_size = AES_256_KEYSIZE; - break; - } - -@@ -209,11 +213,10 @@ err_status_t aes_icm_openssl_dealloc (cipher_t *c) - return err_status_dealloc_fail; - break; - } -+ /* zeroize the key material */ -+ octet_string_set_to_zero((uint8_t*)ctx, sizeof(aes_icm_ctx_t)); -+ crypto_free(ctx); - } -- -- /* zeroize entire state*/ -- octet_string_set_to_zero((uint8_t*)c, -- sizeof(cipher_t) + sizeof(aes_icm_ctx_t)); - - /* free memory */ - crypto_free(c); ---- crypto/cipher/null_cipher.c.orig 2017-08-01 11:57:38 UTC -+++ crypto/cipher/null_cipher.c -@@ -59,21 +59,21 @@ extern debug_module_t mod_cipher; - err_status_t - null_cipher_alloc(cipher_t **c, int key_len, int tlen) { - extern cipher_type_t null_cipher; -- uint8_t *pointer; - - debug_print(mod_cipher, - "allocating cipher with key length %d", key_len); - - /* allocate memory a cipher of type null_cipher */ -- pointer = (uint8_t*)crypto_alloc(sizeof(null_cipher_ctx_t) + sizeof(cipher_t)); -- if (pointer == NULL) -+ *c = (cipher_t *)crypto_alloc(sizeof(cipher_t)); -+ if (*c == NULL) - return err_status_alloc_fail; - -+ memset(*c, 0x0, sizeof(cipher_t)); -+ - /* set pointers */ -- *c = (cipher_t *)pointer; - (*c)->algorithm = NULL_CIPHER; - (*c)->type = &null_cipher; -- (*c)->state = pointer + sizeof(cipher_t); -+ (*c)->state = 0x1; /* The null cipher does not maintain state */ - - /* set key size */ - (*c)->key_len = key_len; -@@ -90,8 +90,7 @@ null_cipher_dealloc(cipher_t *c) { - extern cipher_type_t null_cipher; - - /* zeroize entire state*/ -- octet_string_set_to_zero((uint8_t *)c, -- sizeof(null_cipher_ctx_t) + sizeof(cipher_t)); -+ octet_string_set_to_zero((uint8_t*)c, sizeof(cipher_t)); - - /* free memory of type null_cipher */ - crypto_free(c); ---- crypto/test/cipher_driver.c.orig 2017-08-01 11:57:38 UTC -+++ crypto/test/cipher_driver.c -@@ -58,7 +58,6 @@ - #else - #include "aes_icm.h" - #endif --#include "null_cipher.h" - - #define PRINT_DEBUG 0 - diff --git a/net/libsrtp/files/patch-01-5781341 b/net/libsrtp/files/patch-01-5781341 deleted file mode 100644 index 80dbc3090de4..000000000000 --- a/net/libsrtp/files/patch-01-5781341 +++ /dev/null @@ -1,254 +0,0 @@ -Backport of https://github.com/cisco/libsrtp/commit/5781341d99cd286a1f3d164e0576c2e837a444b7 - ---- crypto/hash/hmac_ossl.c.orig 2017-08-01 11:57:38 UTC -+++ crypto/hash/hmac_ossl.c -@@ -46,11 +46,12 @@ - #include <config.h> - #endif - --#include "hmac.h" -+#include "auth.h" - #include "alloc.h" - #include <openssl/evp.h> -+#include <openssl/hmac.h> - --#define HMAC_KEYLEN_MAX 20 -+#define SHA1_DIGEST_SIZE 20 - - /* the debug module for authentiation */ - -@@ -65,26 +66,18 @@ hmac_alloc (auth_t **a, int key_len, int out_len) - { - extern auth_type_t hmac; - uint8_t *pointer; -- hmac_ctx_t *new_hmac_ctx; -+ HMAC_CTX *new_hmac_ctx; - - debug_print(mod_hmac, "allocating auth func with key length %d", key_len); - debug_print(mod_hmac, " tag length %d", out_len); - -- /* -- * check key length - note that we don't support keys larger -- * than 20 bytes yet -- */ -- if (key_len > HMAC_KEYLEN_MAX) { -- return err_status_bad_param; -- } -- - /* check output length - should be less than 20 bytes */ -- if (out_len > HMAC_KEYLEN_MAX) { -+ if (out_len > SHA1_DIGEST_SIZE) { - return err_status_bad_param; - } - -- /* allocate memory for auth and hmac_ctx_t structures */ -- pointer = (uint8_t*)crypto_alloc(sizeof(hmac_ctx_t) + sizeof(auth_t)); -+ /* allocate memory for auth and HMAC_CTX structures */ -+ pointer = (uint8_t*)crypto_alloc(sizeof(HMAC_CTX) + sizeof(auth_t)); - if (pointer == NULL) { - return err_status_alloc_fail; - } -@@ -96,8 +89,8 @@ hmac_alloc (auth_t **a, int key_len, int out_len) - (*a)->out_len = out_len; - (*a)->key_len = key_len; - (*a)->prefix_len = 0; -- new_hmac_ctx = (hmac_ctx_t*)((*a)->state); -- memset(new_hmac_ctx, 0, sizeof(hmac_ctx_t)); -+ new_hmac_ctx = (HMAC_CTX*)((*a)->state); -+ HMAC_CTX_init(new_hmac_ctx); - - /* increment global count of all hmac uses */ - hmac.ref_count++; -@@ -109,19 +102,15 @@ err_status_t - hmac_dealloc (auth_t *a) - { - extern auth_type_t hmac; -- hmac_ctx_t *hmac_ctx; -+ HMAC_CTX *hmac_ctx; - -- hmac_ctx = (hmac_ctx_t*)a->state; -- if (hmac_ctx->ctx_initialized) { -- EVP_MD_CTX_cleanup(&hmac_ctx->ctx); -- } -- if (hmac_ctx->init_ctx_initialized) { -- EVP_MD_CTX_cleanup(&hmac_ctx->init_ctx); -- } -+ hmac_ctx = (HMAC_CTX*)a->state; - -+ HMAC_CTX_cleanup(hmac_ctx); -+ - /* zeroize entire state*/ - octet_string_set_to_zero((uint8_t*)a, -- sizeof(hmac_ctx_t) + sizeof(auth_t)); -+ sizeof(HMAC_CTX) + sizeof(auth_t)); - - /* free memory */ - crypto_free(a); -@@ -133,113 +122,65 @@ hmac_dealloc (auth_t *a) - } - - err_status_t --hmac_init (hmac_ctx_t *state, const uint8_t *key, int key_len) -+hmac_init (HMAC_CTX *state, const uint8_t *key, int key_len) - { -- int i; -- uint8_t ipad[64]; -+ if (HMAC_Init_ex(state, key, key_len, EVP_sha1(), NULL) == 0) -+ return err_status_auth_fail; - -- /* -- * check key length - note that we don't support keys larger -- * than 20 bytes yet -- */ -- if (key_len > HMAC_KEYLEN_MAX) { -- return err_status_bad_param; -- } -- -- /* -- * set values of ipad and opad by exoring the key into the -- * appropriate constant values -- */ -- for (i = 0; i < key_len; i++) { -- ipad[i] = key[i] ^ 0x36; -- state->opad[i] = key[i] ^ 0x5c; -- } -- /* set the rest of ipad, opad to constant values */ -- for (; i < sizeof(ipad); i++) { -- ipad[i] = 0x36; -- ((uint8_t*)state->opad)[i] = 0x5c; -- } -- -- debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, sizeof(ipad))); -- -- /* initialize sha1 context */ -- sha1_init(&state->init_ctx); -- state->init_ctx_initialized = 1; -- -- /* hash ipad ^ key */ -- sha1_update(&state->init_ctx, ipad, sizeof(ipad)); -- return (hmac_start(state)); -+ return err_status_ok; - } - - err_status_t --hmac_start (hmac_ctx_t *state) -+hmac_start (HMAC_CTX *state) - { -- if (state->ctx_initialized) { -- EVP_MD_CTX_cleanup(&state->ctx); -- } -- if (!EVP_MD_CTX_copy(&state->ctx, &state->init_ctx)) { -+ if (HMAC_Init_ex(state, NULL, 0, NULL, NULL) == 0) - return err_status_auth_fail; -- } else { -- state->ctx_initialized = 1; -- return err_status_ok; -- } -+ -+ return err_status_ok; - } - - err_status_t --hmac_update (hmac_ctx_t *state, const uint8_t *message, int msg_octets) -+hmac_update (HMAC_CTX *state, const uint8_t *message, int msg_octets) - { - debug_print(mod_hmac, "input: %s", - octet_string_hex_string(message, msg_octets)); - -- /* hash message into sha1 context */ -- sha1_update(&state->ctx, message, msg_octets); -+ if (HMAC_Update(state, message, msg_octets) == 0) -+ return err_status_auth_fail; - - return err_status_ok; - } - - err_status_t --hmac_compute (hmac_ctx_t *state, const void *message, -+hmac_compute (HMAC_CTX *state, const void *message, - int msg_octets, int tag_len, uint8_t *result) - { -- uint32_t hash_value[5]; -- uint32_t H[5]; -+ uint8_t hash_value[SHA1_DIGEST_SIZE]; - int i; -+ unsigned int len; - - /* check tag length, return error if we can't provide the value expected */ -- if (tag_len > HMAC_KEYLEN_MAX) { -+ if (tag_len > SHA1_DIGEST_SIZE) { - return err_status_bad_param; - } - - /* hash message, copy output into H */ -- sha1_update(&state->ctx, message, msg_octets); -- sha1_final(&state->ctx, H); -+ if (HMAC_Update(state, message, msg_octets) == 0) -+ return err_status_auth_fail; - -- /* -- * note that we don't need to debug_print() the input, since the -- * function hmac_update() already did that for us -- */ -- debug_print(mod_hmac, "intermediate state: %s", -- octet_string_hex_string((uint8_t*)H, sizeof(H))); -+ if (HMAC_Final(state, hash_value, &len) == 0) -+ return err_status_auth_fail; - -- /* re-initialize hash context */ -- sha1_init(&state->ctx); -+ if (len < tag_len) -+ return err_status_auth_fail; - -- /* hash opad ^ key */ -- sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad)); -- -- /* hash the result of the inner hash */ -- sha1_update(&state->ctx, (uint8_t*)H, sizeof(H)); -- -- /* the result is returned in the array hash_value[] */ -- sha1_final(&state->ctx, hash_value); -- - /* copy hash_value to *result */ - for (i = 0; i < tag_len; i++) { -- result[i] = ((uint8_t*)hash_value)[i]; -+ result[i] = hash_value[i]; - } - - debug_print(mod_hmac, "output: %s", -- octet_string_hex_string((uint8_t*)hash_value, tag_len)); -+ octet_string_hex_string(hash_value, tag_len)); - - return err_status_ok; - } -@@ -248,7 +189,7 @@ hmac_compute (hmac_ctx_t *state, const void *message, - /* begin test case 0 */ - - uint8_t -- hmac_test_case_0_key[HMAC_KEYLEN_MAX] = { -+ hmac_test_case_0_key[SHA1_DIGEST_SIZE] = { - 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b -@@ -260,7 +201,7 @@ uint8_t - }; - - uint8_t -- hmac_test_case_0_tag[HMAC_KEYLEN_MAX] = { -+ hmac_test_case_0_tag[SHA1_DIGEST_SIZE] = { - 0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, - 0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e, - 0xf1, 0x46, 0xbe, 0x00 ---- crypto/include/hmac.h.orig 2017-08-01 11:57:38 UTC -+++ crypto/include/hmac.h -@@ -53,10 +53,6 @@ typedef struct { - uint8_t opad[64]; - sha1_ctx_t ctx; - sha1_ctx_t init_ctx; --#ifdef OPENSSL -- int ctx_initialized; -- int init_ctx_initialized; --#endif - } hmac_ctx_t; - - err_status_t diff --git a/net/libsrtp/files/patch-02-fb95445 b/net/libsrtp/files/patch-02-fb95445 deleted file mode 100644 index a739316209b0..000000000000 --- a/net/libsrtp/files/patch-02-fb95445 +++ /dev/null @@ -1,113 +0,0 @@ -Backport of https://github.com/cisco/libsrtp/commit/fb954450198c832c96b4191fcef3a1b9e2d15d8b - ---- crypto/cipher/aes_icm_ossl.c.orig 2018-06-10 20:33:16 UTC -+++ crypto/cipher/aes_icm_ossl.c -@@ -235,6 +235,8 @@ err_status_t aes_icm_openssl_dealloc (cipher_t *c) - */ - err_status_t aes_icm_openssl_context_init (aes_icm_ctx_t *c, const uint8_t *key, int len) - { -+ const EVP_CIPHER *evp; -+ - /* - * set counter and initial values to 'offset' value, being careful not to - * go past the end of the key buffer -@@ -252,30 +254,35 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx - c->offset.v8[SALT_SIZE] = c->offset.v8[SALT_SIZE + 1] = 0; - c->counter.v8[SALT_SIZE] = c->counter.v8[SALT_SIZE + 1] = 0; - -- /* copy key to be used later when CiscoSSL crypto context is created */ -- v128_copy_octet_string((v128_t*)&c->key, key); -+ debug_print(mod_aes_icm, "key: %s", octet_string_hex_string(key, c->key_size)); -+ debug_print(mod_aes_icm, "offset: %s", v128_hex_string(&c->offset)); - -- /* if the key is greater than 16 bytes, copy the second -- * half. Note, we treat AES-192 and AES-256 the same here -- * for simplicity. The storage location receiving the -- * key is statically allocated to handle a full 32 byte key -- * regardless of the cipher in use. -- */ -- if (c->key_size == AES_256_KEYSIZE -+ EVP_CIPHER_CTX_init(&c->ctx); -+ -+ switch (c->key_size) { -+ case AES_256_KEYSIZE: -+ evp = EVP_aes_256_ctr(); -+ break; - #ifndef SRTP_NO_AES192 -- || c->key_size == AES_192_KEYSIZE -+ case AES_192_KEYSIZE: -+ evp = EVP_aes_192_ctr(); -+ break; - #endif -- ) { -- debug_print(mod_aes_icm, "Copying last 16 bytes of key: %s", -- v128_hex_string((v128_t*)(key + AES_128_KEYSIZE))); -- v128_copy_octet_string(((v128_t*)(&c->key.v8)) + 1, key + AES_128_KEYSIZE); -+ case AES_128_KEYSIZE: -+ evp = EVP_aes_128_ctr(); -+ break; -+ default: -+ return err_status_bad_param; -+ break; - } - -- debug_print(mod_aes_icm, "key: %s", v128_hex_string((v128_t*)&c->key)); -- debug_print(mod_aes_icm, "offset: %s", v128_hex_string(&c->offset)); -+ if (!EVP_EncryptInit_ex(&c->ctx, evp, -+ NULL, key, NULL)) { -+ return err_status_fail; -+ } else { -+ return err_status_ok; -+ } - -- EVP_CIPHER_CTX_cleanup(&c->ctx); -- - return err_status_ok; - } - -@@ -286,7 +293,6 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx - */ - err_status_t aes_icm_openssl_set_iv (aes_icm_ctx_t *c, void *iv, int dir) - { -- const EVP_CIPHER *evp; - v128_t nonce; - - /* set nonce (for alignment) */ -@@ -298,25 +304,8 @@ err_status_t aes_icm_openssl_set_iv (aes_icm_ctx_t *c, - - debug_print(mod_aes_icm, "set_counter: %s", v128_hex_string(&c->counter)); - -- switch (c->key_size) { -- case AES_256_KEYSIZE: -- evp = EVP_aes_256_ctr(); -- break; --#ifndef SRTP_NO_AES192 -- case AES_192_KEYSIZE: -- evp = EVP_aes_192_ctr(); -- break; --#endif -- case AES_128_KEYSIZE: -- evp = EVP_aes_128_ctr(); -- break; -- default: -- return err_status_bad_param; -- break; -- } -- -- if (!EVP_EncryptInit_ex(&c->ctx, evp, -- NULL, c->key.v8, c->counter.v8)) { -+ if (!EVP_EncryptInit_ex(&c->ctx, NULL, -+ NULL, NULL, c->counter.v8)) { - return err_status_fail; - } else { - return err_status_ok; ---- crypto/include/aes_icm_ossl.h.orig 2017-08-01 11:57:38 UTC -+++ crypto/include/aes_icm_ossl.h -@@ -70,7 +70,6 @@ - typedef struct { - v128_t counter; /* holds the counter value */ - v128_t offset; /* initial offset value */ -- v256_t key; - int key_size; - EVP_CIPHER_CTX ctx; - } aes_icm_ctx_t; diff --git a/net/libsrtp/files/patch-03-1acba56 b/net/libsrtp/files/patch-03-1acba56 deleted file mode 100644 index 342453baa05c..000000000000 --- a/net/libsrtp/files/patch-03-1acba56 +++ /dev/null @@ -1,83 +0,0 @@ -Backport of https://github.com/cisco/libsrtp/commit/1acba569915d8124b627a29dd5e3500332618eac - ---- crypto/cipher/aes_gcm_ossl.c.orig 2018-06-10 18:51:02 UTC -+++ crypto/cipher/aes_gcm_ossl.c -@@ -187,22 +187,28 @@ err_status_t aes_gcm_openssl_dealloc (cipher_t *c) - */ - err_status_t aes_gcm_openssl_context_init (aes_gcm_ctx_t *c, const uint8_t *key) - { -+ const EVP_CIPHER *evp; -+ - c->dir = direction_any; - -- /* copy key to be used later when CiscoSSL crypto context is created */ -- v128_copy_octet_string((v128_t*)&c->key, key); -+ debug_print(mod_aes_gcm, "key: %s", octet_string_hex_string(key, c->key_size)); - -- if (c->key_size == AES_256_KEYSIZE) { -- debug_print(mod_aes_gcm, "Copying last 16 bytes of key: %s", -- v128_hex_string((v128_t*)(key + AES_128_KEYSIZE))); -- v128_copy_octet_string(((v128_t*)(&c->key.v8)) + 1, -- key + AES_128_KEYSIZE); -+ switch (c->key_size) { -+ case AES_256_KEYSIZE: -+ evp = EVP_aes_256_gcm(); -+ break; -+ case AES_128_KEYSIZE: -+ evp = EVP_aes_128_gcm(); -+ break; -+ default: -+ return (err_status_bad_param); -+ break; - } - -- debug_print(mod_aes_gcm, "key: %s", v128_hex_string((v128_t*)&c->key)); -+ if (!EVP_CipherInit_ex(&c->ctx, evp, NULL, key, NULL, 0)) { -+ return (err_status_init_fail); -+ } - -- EVP_CIPHER_CTX_cleanup(&c->ctx); -- - return (err_status_ok); - } - -@@ -214,8 +220,6 @@ err_status_t aes_gcm_openssl_context_init (aes_gcm_ctx - err_status_t aes_gcm_openssl_set_iv (aes_gcm_ctx_t *c, void *iv, - int direction) - { -- const EVP_CIPHER *evp; -- - if (direction != direction_encrypt && direction != direction_decrypt) { - return (err_status_bad_param); - } -@@ -223,19 +227,7 @@ err_status_t aes_gcm_openssl_set_iv (aes_gcm_ctx_t *c, - - debug_print(mod_aes_gcm, "setting iv: %s", v128_hex_string(iv)); - -- switch (c->key_size) { -- case AES_256_KEYSIZE: -- evp = EVP_aes_256_gcm(); -- break; -- case AES_128_KEYSIZE: -- evp = EVP_aes_128_gcm(); -- break; -- default: -- return (err_status_bad_param); -- break; -- } -- -- if (!EVP_CipherInit_ex(&c->ctx, evp, NULL, (const unsigned char*)&c->key.v8, -+ if (!EVP_CipherInit_ex(&c->ctx, NULL, NULL, NULL, - NULL, (c->dir == direction_encrypt ? 1 : 0))) { - return (err_status_init_fail); - } ---- crypto/include/aes_gcm_ossl.h.orig 2017-08-01 11:57:38 UTC -+++ crypto/include/aes_gcm_ossl.h -@@ -52,7 +52,6 @@ - #include <openssl/aes.h> - - typedef struct { -- v256_t key; - int key_size; - int tag_len; - EVP_CIPHER_CTX ctx; diff --git a/net/libsrtp/files/patch-04-0b45423 b/net/libsrtp/files/patch-04-0b45423 deleted file mode 100644 index 5e7975e5fd32..000000000000 --- a/net/libsrtp/files/patch-04-0b45423 +++ /dev/null @@ -1,361 +0,0 @@ -Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f20bfbd112ddd - ---- crypto/cipher/aes_gcm_ossl.c.orig 2018-06-11 07:46:09 UTC -+++ crypto/cipher/aes_gcm_ossl.c -@@ -117,6 +117,14 @@ err_status_t aes_gcm_openssl_alloc (cipher_t **c, int - } - memset(gcm, 0x0, sizeof(aes_gcm_ctx_t)); - -+ gcm->ctx = EVP_CIPHER_CTX_new(); -+ if (gcm->ctx == NULL) { -+ crypto_free(gcm); -+ crypto_free(*c); -+ *c = NULL; -+ return err_status_alloc_fail; -+ } -+ - /* set pointers */ - (*c)->state = gcm; - -@@ -140,7 +148,6 @@ err_status_t aes_gcm_openssl_alloc (cipher_t **c, int - - /* set key size */ - (*c)->key_len = key_len; -- EVP_CIPHER_CTX_init(&gcm->ctx); - - return (err_status_ok); - } -@@ -155,7 +162,7 @@ err_status_t aes_gcm_openssl_dealloc (cipher_t *c) - - ctx = (aes_gcm_ctx_t*)c->state; - if (ctx) { -- EVP_CIPHER_CTX_cleanup(&ctx->ctx); -+ EVP_CIPHER_CTX_free(ctx->ctx); - /* decrement ref_count for the appropriate engine */ - switch (ctx->key_size) { - case AES_256_KEYSIZE: -@@ -205,7 +212,7 @@ err_status_t aes_gcm_openssl_context_init (aes_gcm_ctx - break; - } - -- if (!EVP_CipherInit_ex(&c->ctx, evp, NULL, key, NULL, 0)) { -+ if (!EVP_CipherInit_ex(c->ctx, evp, NULL, key, NULL, 0)) { - return (err_status_init_fail); - } - -@@ -227,19 +234,19 @@ err_status_t aes_gcm_openssl_set_iv (aes_gcm_ctx_t *c, - - debug_print(mod_aes_gcm, "setting iv: %s", v128_hex_string(iv)); - -- if (!EVP_CipherInit_ex(&c->ctx, NULL, NULL, NULL, -+ if (!EVP_CipherInit_ex(c->ctx, NULL, NULL, NULL, - NULL, (c->dir == direction_encrypt ? 1 : 0))) { - return (err_status_init_fail); - } - - /* set IV len and the IV value, the followiong 3 calls are required */ -- if (!EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_IVLEN, 12, 0)) { -+ if (!EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_IVLEN, 12, 0)) { - return (err_status_init_fail); - } -- if (!EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_IV_FIXED, -1, iv)) { -+ if (!EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_IV_FIXED, -1, iv)) { - return (err_status_init_fail); - } -- if (!EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_IV_GEN, 0, iv)) { -+ if (!EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_IV_GEN, 0, iv)) { - return (err_status_init_fail); - } - -@@ -263,9 +270,9 @@ err_status_t aes_gcm_openssl_set_aad (aes_gcm_ctx_t *c - * Set dummy tag, OpenSSL requires the Tag to be set before - * processing AAD - */ -- EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, aad); -+ EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, aad); - -- rv = EVP_Cipher(&c->ctx, NULL, aad, aad_len); -+ rv = EVP_Cipher(c->ctx, NULL, aad, aad_len); - if (rv != aad_len) { - return (err_status_algo_fail); - } else { -@@ -291,7 +298,7 @@ err_status_t aes_gcm_openssl_encrypt (aes_gcm_ctx_t *c - /* - * Encrypt the data - */ -- EVP_Cipher(&c->ctx, buf, buf, *enc_len); -+ EVP_Cipher(c->ctx, buf, buf, *enc_len); - - return (err_status_ok); - } -@@ -313,12 +320,12 @@ err_status_t aes_gcm_openssl_get_tag (aes_gcm_ctx_t *c - /* - * Calculate the tag - */ -- EVP_Cipher(&c->ctx, NULL, NULL, 0); -+ EVP_Cipher(c->ctx, NULL, NULL, 0); - - /* - * Retreive the tag - */ -- EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_GET_TAG, c->tag_len, buf); -+ EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_GET_TAG, c->tag_len, buf); - - /* - * Increase encryption length by desired tag size -@@ -347,14 +354,14 @@ err_status_t aes_gcm_openssl_decrypt (aes_gcm_ctx_t *c - /* - * Set the tag before decrypting - */ -- EVP_CIPHER_CTX_ctrl(&c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, -+ EVP_CIPHER_CTX_ctrl(c->ctx, EVP_CTRL_GCM_SET_TAG, c->tag_len, - buf + (*enc_len - c->tag_len)); -- EVP_Cipher(&c->ctx, buf, buf, *enc_len - c->tag_len); -+ EVP_Cipher(c->ctx, buf, buf, *enc_len - c->tag_len); - - /* - * Check the tag - */ -- if (EVP_Cipher(&c->ctx, NULL, NULL, 0)) { -+ if (EVP_Cipher(c->ctx, NULL, NULL, 0)) { - return (err_status_auth_fail); - } - ---- crypto/cipher/aes_icm_ossl.c.orig 2018-06-11 07:46:00 UTC -+++ crypto/cipher/aes_icm_ossl.c -@@ -144,6 +144,14 @@ err_status_t aes_icm_openssl_alloc (cipher_t **c, int - } - memset(icm, 0x0, sizeof(aes_icm_ctx_t)); - -+ icm->ctx = EVP_CIPHER_CTX_new(); -+ if (icm->ctx == NULL) { -+ crypto_free(icm); -+ crypto_free(*c); -+ *c = NULL; -+ return err_status_alloc_fail; -+ } -+ - /* set pointers */ - (*c)->state = icm; - -@@ -173,7 +181,6 @@ err_status_t aes_icm_openssl_alloc (cipher_t **c, int - - /* set key size */ - (*c)->key_len = key_len; -- EVP_CIPHER_CTX_init(&icm->ctx); - - return err_status_ok; - } -@@ -195,7 +202,7 @@ err_status_t aes_icm_openssl_dealloc (cipher_t *c) - */ - ctx = (aes_icm_ctx_t*)c->state; - if (ctx != NULL) { -- EVP_CIPHER_CTX_cleanup(&ctx->ctx); -+ EVP_CIPHER_CTX_free(ctx->ctx); - /* decrement ref_count for the appropriate engine */ - switch (ctx->key_size) { - case AES_256_KEYSIZE: -@@ -257,8 +264,6 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx - debug_print(mod_aes_icm, "key: %s", octet_string_hex_string(key, c->key_size)); - debug_print(mod_aes_icm, "offset: %s", v128_hex_string(&c->offset)); - -- EVP_CIPHER_CTX_init(&c->ctx); -- - switch (c->key_size) { - case AES_256_KEYSIZE: - evp = EVP_aes_256_ctr(); -@@ -276,7 +281,7 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx - break; - } - -- if (!EVP_EncryptInit_ex(&c->ctx, evp, -+ if (!EVP_EncryptInit_ex(c->ctx, evp, - NULL, key, NULL)) { - return err_status_fail; - } else { -@@ -304,7 +309,7 @@ err_status_t aes_icm_openssl_set_iv (aes_icm_ctx_t *c, - - debug_print(mod_aes_icm, "set_counter: %s", v128_hex_string(&c->counter)); - -- if (!EVP_EncryptInit_ex(&c->ctx, NULL, -+ if (!EVP_EncryptInit_ex(c->ctx, NULL, - NULL, NULL, c->counter.v8)) { - return err_status_fail; - } else { -@@ -326,12 +331,12 @@ err_status_t aes_icm_openssl_encrypt (aes_icm_ctx_t *c - - debug_print(mod_aes_icm, "rs0: %s", v128_hex_string(&c->counter)); - -- if (!EVP_EncryptUpdate(&c->ctx, buf, &len, buf, *enc_len)) { -+ if (!EVP_EncryptUpdate(c->ctx, buf, &len, buf, *enc_len)) { - return err_status_cipher_fail; - } - *enc_len = len; - -- if (!EVP_EncryptFinal_ex(&c->ctx, buf, &len)) { -+ if (!EVP_EncryptFinal_ex(c->ctx, buf, &len)) { - return err_status_cipher_fail; - } - *enc_len += len; ---- crypto/hash/hmac_ossl.c.orig 2018-06-11 07:45:39 UTC -+++ crypto/hash/hmac_ossl.c -@@ -65,8 +65,6 @@ err_status_t - hmac_alloc (auth_t **a, int key_len, int out_len) - { - extern auth_type_t hmac; -- uint8_t *pointer; -- HMAC_CTX *new_hmac_ctx; - - debug_print(mod_hmac, "allocating auth func with key length %d", key_len); - debug_print(mod_hmac, " tag length %d", out_len); -@@ -76,21 +74,43 @@ hmac_alloc (auth_t **a, int key_len, int out_len) - return err_status_bad_param; - } - -- /* allocate memory for auth and HMAC_CTX structures */ -- pointer = (uint8_t*)crypto_alloc(sizeof(HMAC_CTX) + sizeof(auth_t)); -- if (pointer == NULL) { -+/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated -+ using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ { -+ /* allocate memory for auth and HMAC_CTX structures */ -+ uint8_t* pointer; -+ HMAC_CTX *new_hmac_ctx; -+ pointer = (uint8_t*)crypto_alloc(sizeof(HMAC_CTX) + sizeof(auth_t)); -+ if (pointer == NULL) { -+ return err_status_alloc_fail; -+ } -+ *a = (auth_t*)pointer; -+ (*a)->state = pointer + sizeof(auth_t); -+ new_hmac_ctx = (HMAC_CTX*)((*a)->state); -+ -+ HMAC_CTX_init(new_hmac_ctx); -+ } -+ -+#else -+ *a = (auth_t*)crypto_alloc(sizeof(auth_t)); -+ if (*a == NULL) { - return err_status_alloc_fail; - } - -+ (*a)->state = HMAC_CTX_new(); -+ if ((*a)->state == NULL) { -+ crypto_free(*a); -+ *a = NULL; -+ return err_status_alloc_fail; -+ } -+#endif -+ - /* set pointers */ -- *a = (auth_t*)pointer; - (*a)->type = &hmac; -- (*a)->state = pointer + sizeof(auth_t); - (*a)->out_len = out_len; - (*a)->key_len = key_len; - (*a)->prefix_len = 0; -- new_hmac_ctx = (HMAC_CTX*)((*a)->state); -- HMAC_CTX_init(new_hmac_ctx); - - /* increment global count of all hmac uses */ - hmac.ref_count++; -@@ -106,11 +126,19 @@ hmac_dealloc (auth_t *a) - - hmac_ctx = (HMAC_CTX*)a->state; - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - HMAC_CTX_cleanup(hmac_ctx); - - /* zeroize entire state*/ - octet_string_set_to_zero((uint8_t*)a, - sizeof(HMAC_CTX) + sizeof(auth_t)); -+ -+#else -+ HMAC_CTX_free(hmac_ctx); -+ -+ /* zeroize entire state*/ -+ octet_string_set_to_zero((uint8_t*)a, sizeof(auth_t)); -+#endif - - /* free memory */ - crypto_free(a); ---- crypto/include/aes_gcm_ossl.h.orig 2018-06-11 07:46:09 UTC -+++ crypto/include/aes_gcm_ossl.h -@@ -54,7 +54,7 @@ - typedef struct { - int key_size; - int tag_len; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX* ctx; - cipher_direction_t dir; - } aes_gcm_ctx_t; - ---- crypto/include/aes_icm_ossl.h.orig 2018-06-11 07:46:00 UTC -+++ crypto/include/aes_icm_ossl.h -@@ -71,7 +71,7 @@ typedef struct { - v128_t counter; /* holds the counter value */ - v128_t offset; /* initial offset value */ - int key_size; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX* ctx; - } aes_icm_ctx_t; - - err_status_t aes_icm_openssl_set_iv(aes_icm_ctx_t *c, void *iv, int dir); ---- crypto/include/sha1.h.orig 2017-08-01 11:57:38 UTC -+++ crypto/include/sha1.h -@@ -56,8 +56,6 @@ - #include <openssl/evp.h> - #include <stdint.h> - --typedef EVP_MD_CTX sha1_ctx_t; -- - /* - * sha1_init(&ctx) initializes the SHA1 context ctx - * -@@ -72,6 +70,12 @@ typedef EVP_MD_CTX sha1_ctx_t; - * - */ - -+/* OpenSSL 1.1.0 made EVP_MD_CTX an opaque structure, which must be allocated -+ using EVP_MD_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+typedef EVP_MD_CTX sha1_ctx_t; -+ - static inline void sha1_init (sha1_ctx_t *ctx) - { - EVP_MD_CTX_init(ctx); -@@ -88,7 +92,33 @@ static inline void sha1_final (sha1_ctx_t *ctx, uint32 - unsigned int len = 0; - - EVP_DigestFinal(ctx, (unsigned char*)output, &len); -+ EVP_MD_CTX_cleanup(ctx); - } -+ -+#else -+ -+typedef EVP_MD_CTX* sha1_ctx_t; -+ -+static inline void sha1_init (sha1_ctx_t *ctx) -+{ -+ *ctx = EVP_MD_CTX_new(); -+ EVP_DigestInit(*ctx, EVP_sha1()); -+} -+ -+static inline void sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) -+{ -+ EVP_DigestUpdate(*ctx, M, octets_in_msg); -+} -+ -+static inline void sha1_final (sha1_ctx_t *ctx, uint32_t *output) -+{ -+ unsigned int len = 0; -+ -+ EVP_DigestFinal(*ctx, (unsigned char*)output, &len); -+ EVP_MD_CTX_free(*ctx); -+} -+#endif -+ - #else - #include "datatypes.h" - diff --git a/net/libsrtp/files/patch-Makefile.in b/net/libsrtp/files/patch-Makefile.in deleted file mode 100644 index f52d1b156d79..000000000000 --- a/net/libsrtp/files/patch-Makefile.in +++ /dev/null @@ -1,44 +0,0 @@ ---- Makefile.in 2015-03-11 14:02:12 UTC -+++ Makefile.in 2015-04-14 17:56:33 -0400 -@@ -44,7 +44,7 @@ - CC = @CC@ - INCDIR = -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include - DEFS = @DEFS@ --CPPFLAGS= -fPIC @CPPFLAGS@ -+CPPFLAGS= @CPPFLAGS@ - CFLAGS = @CFLAGS@ - LIBS = @LIBS@ - LDFLAGS = -L. @LDFLAGS@ -@@ -84,12 +84,11 @@ - endif - - SHAREDLIBVERSION = 1 --ifeq (linux,$(findstring linux,@host@)) - SHAREDLIB_DIR = $(libdir) - SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ - SHAREDLIBSUFFIXNOVER = so - SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION) --else ifeq (mingw,$(findstring mingw,@host@)) -+ifeq (mingw,$(findstring mingw,@host@)) - SHAREDLIB_DIR = $(bindir) - SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a - SHAREDLIBVERSION = -@@ -108,6 +107,9 @@ - %.o: %.c - $(COMPILE) -c $< -o $@ - -+%.So: %.c -+ $(COMPILE) -DPIC -fPIC -c $< -o $@ -+ - %$(EXE): %.c - $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) - -@@ -143,7 +145,7 @@ - ar cr libsrtp.a $^ - $(RANLIB) libsrtp.a - --libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj) $(cryptobj) $(gdoi) -+libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj:.o=.So) $(cryptobj:.o=.So) $(gdoi:.o=.So) - $(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \ - $^ $(LDFLAGS) $(LIBS) - if [ -n "$(SHAREDLIBVERSION)" ]; then \ diff --git a/net/libsrtp/files/patch-libsrtp.pc.in b/net/libsrtp/files/patch-libsrtp.pc.in deleted file mode 100644 index 2b44f02ce08e..000000000000 --- a/net/libsrtp/files/patch-libsrtp.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- libsrtp.pc.in.orig 2014-12-30 16:27:06 UTC -+++ libsrtp.pc.in -@@ -7,5 +7,6 @@ Name: @PACKAGE_NAME@ - Version: @PACKAGE_VERSION@ - Description: Library for SRTP (Secure Realtime Transport Protocol) - --Libs: -L${libdir} -lsrtp @LIBS@ -+Libs: -L${libdir} -lsrtp -+Libs.private: -lcrypto - Cflags: -I${includedir} diff --git a/net/libsrtp/pkg-descr b/net/libsrtp/pkg-descr deleted file mode 100644 index 3edb51cd5bde..000000000000 --- a/net/libsrtp/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This package provides an implementation of the Secure Real-time -Transport Protocol (SRTP), the Universal Security Transform (UST), -and a supporting cryptographic kernel. - -WWW: https://github.com/cisco/libsrtp diff --git a/net/libsrtp/pkg-plist b/net/libsrtp/pkg-plist deleted file mode 100644 index e0f3d0050d52..000000000000 --- a/net/libsrtp/pkg-plist +++ /dev/null @@ -1,41 +0,0 @@ -include/srtp/aes.h -include/srtp/aes_cbc.h -include/srtp/aes_gcm_ossl.h -include/srtp/aes_icm.h -include/srtp/aes_icm_ossl.h -include/srtp/alloc.h -include/srtp/auth.h -include/srtp/cipher.h -include/srtp/config.h -include/srtp/crypto.h -include/srtp/crypto_kernel.h -include/srtp/crypto_math.h -include/srtp/crypto_types.h -include/srtp/cryptoalg.h -include/srtp/datatypes.h -include/srtp/ekt.h -include/srtp/err.h -include/srtp/getopt_s.h -include/srtp/gf2_8.h -include/srtp/hmac.h -include/srtp/integers.h -include/srtp/kernel_compat.h -include/srtp/key.h -include/srtp/null_auth.h -include/srtp/null_cipher.h -include/srtp/prng.h -include/srtp/rand_source.h -include/srtp/rdb.h -include/srtp/rdbx.h -include/srtp/rtp.h -include/srtp/rtp_priv.h -include/srtp/sha1.h -include/srtp/srtp.h -include/srtp/srtp_priv.h -include/srtp/stat.h -include/srtp/ut_sim.h -include/srtp/xfm.h -lib/libsrtp.a -lib/libsrtp.so -lib/libsrtp.so.1 -libdata/pkgconfig/libsrtp.pc diff --git a/security/Makefile b/security/Makefile index 013b9e11866a..f78e5760719c 100644 --- a/security/Makefile +++ b/security/Makefile @@ -314,7 +314,6 @@ SUBDIR += kqoauth SUBDIR += kr SUBDIR += krb5 - SUBDIR += krb5-114 SUBDIR += krb5-115 SUBDIR += krb5-116 SUBDIR += krb5-appl diff --git a/security/krb5-114/Makefile b/security/krb5-114/Makefile deleted file mode 100644 index ee0818b62878..000000000000 --- a/security/krb5-114/Makefile +++ /dev/null @@ -1,158 +0,0 @@ -# Created by: nectar@FreeBSD.org -# $FreeBSD$ - -PORTNAME= krb5 -PORTVERSION= 1.14.6 -PORTREVISION= 4 -CATEGORIES= security -MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ -.if !defined(MASTERDIR) -PKGNAMESUFFIX= -114 -.endif - -PATCH_SITES= http://web.mit.edu/kerberos/advisories/ -PATCH_DIST_STRIP= -p2 - -MAINTAINER= cy@FreeBSD.org -COMMENT= MIT implementation of RFC 4120 network authentication service - -LICENSE= MIT - -DEPRECATED= EOL twelve months after release of krb5-1.16 -EXPIRATION_DATE= 2018-12-31 - -BROKEN_FreeBSD_12= Fails to build after import of openssl111 -BROKEN_FreeBSD_13= Fails to build after import of openssl111 -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= OpenSSL >= 1.1.0 unsupported. - - -CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[35]-[0-9]* \ - krb5-1.[0-9]* krb5-devel-* -CONFLICTS_BUILD= boringssl-* - -KERBEROSV_URL= http://web.mit.edu/kerberos/ -USE_PERL5= build -USE_LDCONFIG= yes -USE_CSTD= gnu99 -GNU_CONFIGURE= yes -USES= cpe gmake localbase perl5 libtool:build \ - gssapi:bootstrap,mit pkgconfig:run ssl \ - gettext-runtime -CONFIGURE_ARGS?= --enable-shared --without-system-verto \ - --disable-rpath --localstatedir="${PREFIX}/var" -CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" -MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" - -CPE_VENDOR= mit -CPE_VERSION= 5-${PORTVERSION} -CPE_PRODUCT= kerberos - -OPTIONS_DEFINE= EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP -OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE -OPTIONS_RADIO= CMD_LINE_EDITING -OPTIONS_RADIO_CMD_LINE_EDITING= READLINE READLINE_PORT LIBEDIT -CMD_LINE_EDITING_DESC= Command line editing for kadmin and ktutil -KRB5_PDF_DESC= Install krb5 PDF documentation -KRB5_HTML_DESC= Install krb5 HTML documentation -DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names -DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm -LDAP= Enable LDAP support -LDAP_USE= OPENLDAP=yes -LDAP_CONFIGURE_WITH= ldap -NLS_USES= gettext -READLINE_USES= readline -READLINE_PORT_DESC= Command line editing via devel/readline -READLINE_PORT_USES= readline:port -LIBEDIT_USES= libedit -LIBEDIT_CONFIGURE_WITH= libedit - -.if defined(KRB5_HOME) -PREFIX= ${KRB5_HOME} -.endif -CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} - -USE_RC_SUBR= kpropd -OPTIONS_SUB= yes -WRKSRC_SUBDIR= src -PORTEXAMPLES= kdc.conf krb5.conf services.append - -.include <bsd.port.options.mk> - -# Fix up -Wl,-rpath in LDFLAGS -.if !empty(KRB5_HOME) -_RPATH= ${KRB5_HOME}/lib: -.else -_RPATH= ${LOCALBASE}/lib: -.endif -.if !empty(LDFLAGS:M-Wl,-rpath,*) -.for F in ${LDFLAGS:M-Wl,-rpath,*} -LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl,-rpath,//} \ - ${LDFLAGS:N-Wl,-rpath,*} -.endfor -.endif - -.if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE} -BROKEN= LIB_DEPENDS when using KRB5_HOME is broken -.endif - -# OPTIONS helper causes conflicting with/without -.if ${PORT_OPTIONS:MREADLINE} || ${PORT_OPTIONS:MREADLINE_PORT} -CONFIGURE_ARGS+= --with-readline -.else -CONFIGURE_ARGS+= --without-readline -.endif - -.if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" -CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" -.endif - -HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html -PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf - -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 -# html documentation -.if ${PORT_OPTIONS:MKRB5_PDF} - pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` - pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d` - for i in $${pdf_dirs}; do \ - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \ - done; \ - for i in $${pdf_files}; do \ - ${INSTALL_DATA} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \ - ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ - done -.endif -.if ${PORT_OPTIONS:MKRB5_HTML} - html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources` - html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources` - for i in $${html_dirs}; do \ - ${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \ - done; \ - for i in $${html_files}; do \ - ${INSTALL_DATA} $${i} ${PREFIX}/share/doc/krb5/$${i}; \ - ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ - done -.endif -.if ${PORT_OPTIONS:MKRB5_PDF} - for i in $${pdf_dirs}; do \ - ${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \ - done | ${TAIL} -r >> ${TMPPLIST} -.endif -.if ${PORT_OPTIONS:MKRB5_HTML} - for i in $${html_dirs}; do \ - ${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \ - done | ${TAIL} -r >> ${TMPPLIST} -.endif - ${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST} - -post-install-LDAP-on: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema \ - ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif \ - ${STAGEDIR}${DATADIR} - -.include <bsd.port.mk> diff --git a/security/krb5-114/distinfo b/security/krb5-114/distinfo deleted file mode 100644 index c04889845c51..000000000000 --- a/security/krb5-114/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1506419928 -SHA256 (krb5-1.14.6.tar.gz) = e259f8ed9f0c2a326e5a4d06b3f268575443fa83c0d348b37b7b5329ac5d0470 -SIZE (krb5-1.14.6.tar.gz) = 12326355 diff --git a/security/krb5-114/files/kpropd.in b/security/krb5-114/files/kpropd.in deleted file mode 100644 index faa27dc7dbba..000000000000 --- a/security/krb5-114/files/kpropd.in +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: kpropd -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# kpropd_enable (bool): Set to NO by default. -# Set it to YES to enable kpropd. -# kpropd_flags (str): Set to "" by default. - -. /etc/rc.subr - -name=kpropd -rcvar=kpropd_enable - -load_rc_config $name - -: ${kpropd_enable:="NO"} -: ${kpropd_flags=""} - -command=%%PREFIX%%/sbin/${name} - -run_rc_command "$1" diff --git a/security/krb5-114/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4 b/security/krb5-114/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4 deleted file mode 100644 index 3316df1e1bb5..000000000000 --- a/security/krb5-114/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4 +++ /dev/null @@ -1,3211 +0,0 @@ -diff --git appl/user_user/client.c b/src/appl/user_user/client.c -index 28901a637..34d852202 100644 ---- appl/user_user/client.c -+++ appl/user_user/client.c -@@ -36,7 +36,7 @@ - int main (int argc, char *argv[]) - { - int s; -- register int retval, i; -+ int retval, i; - char *hname; /* full name of server */ - char **srealms; /* realm(s) of server */ - char *princ; /* principal in credentials cache */ -diff --git clients/ksu/main.c b/src/clients/ksu/main.c -index 6fa74a536..d9596d948 100644 ---- clients/ksu/main.c -+++ clients/ksu/main.c -@@ -932,7 +932,7 @@ cleanup: - int standard_shell(sh) - char *sh; - { -- register char *cp; -+ char *cp; - char *getusershell(); - - while ((cp = getusershell()) != NULL) -diff --git clients/ksu/setenv.c b/src/clients/ksu/setenv.c -index a7895c6b4..c7bd369bc 100644 ---- clients/ksu/setenv.c -+++ clients/ksu/setenv.c -@@ -57,12 +57,12 @@ extern void unsetenv(char *); - #ifndef HAVE_SETENV - int - setenv(name, value, rewrite) -- register char *name, *value; -+ char *name, *value; - int rewrite; - { - extern char **environ; - static int alloced; /* if allocated space before */ -- register char *C; -+ char *C; - int l_value, offset; - - if (*value == '=') /* no `=' in value */ -@@ -77,8 +77,8 @@ setenv(name, value, rewrite) - } - } - else { /* create new slot */ -- register int cnt; -- register char **P; -+ int cnt; -+ char **P; - - for (P = environ, cnt = 0; *P; ++P, ++cnt); - if (alloced) { /* just increase size */ -@@ -119,7 +119,7 @@ unsetenv(name) - char *name; - { - extern char **environ; -- register char **P; -+ char **P; - int offset; - - while (_findenv(name, &offset)) /* if set multiple times */ -@@ -156,12 +156,12 @@ getenv(name) - */ - static char * - _findenv(name, offset) -- register char *name; -+ char *name; - int *offset; - { - extern char **environ; -- register int len; -- register char **P, *C; -+ int len; -+ char **P, *C; - - for (C = name, len = 0; *C && *C != '='; ++C, ++len); - for (P = environ; *P; ++P) -diff --git include/gssrpc/clnt.h b/src/include/gssrpc/clnt.h -index 40f7c69a4..fc6836cb5 100644 ---- include/gssrpc/clnt.h -+++ include/gssrpc/clnt.h -@@ -270,7 +270,7 @@ extern CLIENT *clnt_create(char *, rpcprog_t, rpcvers_t, char *); - * struct sockaddr_in *raddr; - * rpcprog_t prog; - * rpcvers_t version; -- * register int *sockp; -+ * int *sockp; - * u_int sendsz; - * u_int recvsz; - */ -diff --git include/krb5/krb5.hin b/src/include/krb5/krb5.hin -index 6d99de42d..384bb838f 100644 ---- include/krb5/krb5.hin -+++ include/krb5/krb5.hin -@@ -3566,7 +3566,7 @@ krb5_parse_name_flags(krb5_context context, const char *name, - */ - krb5_error_code KRB5_CALLCONV - krb5_unparse_name(krb5_context context, krb5_const_principal principal, -- register char **name); -+ char **name); - - /** - * Convert krb5_principal structure to string and length. -@@ -4389,7 +4389,7 @@ krb5_kt_add_entry(krb5_context context, krb5_keytab id, krb5_keytab_entry *entry - */ - krb5_error_code KRB5_CALLCONV_WRONG - krb5_principal2salt(krb5_context context, -- register krb5_const_principal pr, krb5_data *ret); -+ krb5_const_principal pr, krb5_data *ret); - /* librc.spec--see rcache.h */ - - /* libcc.spec */ -@@ -4730,7 +4730,7 @@ krb5_free_ticket(krb5_context context, krb5_ticket *val); - * This function frees the contents of @a val and the structure itself. - */ - void KRB5_CALLCONV --krb5_free_error(krb5_context context, register krb5_error *val); -+krb5_free_error(krb5_context context, krb5_error *val); - - /** - * Free a krb5_creds structure. -@@ -4763,7 +4763,7 @@ krb5_free_cred_contents(krb5_context context, krb5_creds *val); - * This function frees the contents of @a val and the structure itself. - */ - void KRB5_CALLCONV --krb5_free_checksum(krb5_context context, register krb5_checksum *val); -+krb5_free_checksum(krb5_context context, krb5_checksum *val); - - /** - * Free the contents of a krb5_checksum structure. -@@ -4774,7 +4774,7 @@ krb5_free_checksum(krb5_context context, register krb5_checksum *val); - * This function frees the contents of @a val, but not the structure itself. - */ - void KRB5_CALLCONV --krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val); -+krb5_free_checksum_contents(krb5_context context, krb5_checksum *val); - - /** - * Free a krb5_keyblock structure. -@@ -4785,7 +4785,7 @@ krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val); - * This function frees the contents of @a val and the structure itself. - */ - void KRB5_CALLCONV --krb5_free_keyblock(krb5_context context, register krb5_keyblock *val); -+krb5_free_keyblock(krb5_context context, krb5_keyblock *val); - - /** - * Free the contents of a krb5_keyblock structure. -@@ -4796,7 +4796,7 @@ krb5_free_keyblock(krb5_context context, register krb5_keyblock *val); - * This function frees the contents of @a key, but not the structure itself. - */ - void KRB5_CALLCONV --krb5_free_keyblock_contents(krb5_context context, register krb5_keyblock *key); -+krb5_free_keyblock_contents(krb5_context context, krb5_keyblock *key); - - /** - * Free a krb5_ap_rep_enc_part structure. -@@ -4912,7 +4912,7 @@ krb5_us_timeofday(krb5_context context, - * Kerberos error codes - */ - krb5_error_code KRB5_CALLCONV --krb5_timeofday(krb5_context context, register krb5_timestamp *timeret); -+krb5_timeofday(krb5_context context, krb5_timestamp *timeret); - - /** - * Check if a timestamp is within the allowed clock skew of the current time. -diff --git kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y -index 059f112da..cb039acb3 100644 ---- kadmin/cli/getdate.y -+++ kadmin/cli/getdate.y -@@ -689,9 +689,9 @@ RelativeMonth(time_t Start, time_t RelMonth) - static int - LookupWord(char *buff) - { -- register char *p; -- register char *q; -- register const TABLE *tp; -+ char *p; -+ char *q; -+ const TABLE *tp; - int i; - int abbrev; - -@@ -786,8 +786,8 @@ LookupWord(char *buff) - static int - yylex() - { -- register char c; -- register char *p; -+ char c; -+ char *p; - char buff[20]; - int Count; - int sign; -diff --git kadmin/dbutil/strtok.c b/src/kadmin/dbutil/strtok.c -index 0640c747e..dee466aea 100644 ---- kadmin/dbutil/strtok.c -+++ kadmin/dbutil/strtok.c -@@ -51,11 +51,11 @@ - - char * - nstrtok(s, delim) -- register char *s; -- register const char *delim; -+ char *s; -+ const char *delim; - { -- register const char *spanp; -- register int c, sc; -+ const char *spanp; -+ int c, sc; - char *tok; - static char *last; - -diff --git kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c -index e6e190136..6a21fe6de 100644 ---- kadmin/server/ipropd_svc.c -+++ kadmin/server/ipropd_svc.c -@@ -533,7 +533,7 @@ fail_name: - - void - krb5_iprop_prog_1(struct svc_req *rqstp, -- register SVCXPRT *transp) -+ SVCXPRT *transp) - { - union { - kdb_last_t iprop_get_updates_1_arg; -diff --git kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c -index e43ca0d57..41fc88ac8 100644 ---- kadmin/server/kadm_rpc_svc.c -+++ kadmin/server/kadm_rpc_svc.c -@@ -38,7 +38,7 @@ static int check_rpcsec_auth(struct svc_req *); - - void kadm_1(rqstp, transp) - struct svc_req *rqstp; -- register SVCXPRT *transp; -+ SVCXPRT *transp; - { - union { - cprinc_arg create_principal_2_arg; -diff --git kdc/kdc_util.c b/src/kdc/kdc_util.c -index 13111215d..21af360cd 100644 ---- kdc/kdc_util.c -+++ kdc/kdc_util.c -@@ -87,8 +87,8 @@ concat_authorization_data(krb5_context context, - krb5_authdata **first, krb5_authdata **second, - krb5_authdata ***output) - { -- register int i, j; -- register krb5_authdata **ptr, **retdata; -+ int i, j; -+ krb5_authdata **ptr, **retdata; - - /* count up the entries */ - i = 0; -@@ -638,7 +638,7 @@ check_anon(kdc_realm_t *kdc_active_realm, - KDC_OPT_ENC_TKT_IN_SKEY | KDC_OPT_CNAME_IN_ADDL_TKT) - int - validate_as_request(kdc_realm_t *kdc_active_realm, -- register krb5_kdc_req *request, krb5_db_entry client, -+ krb5_kdc_req *request, krb5_db_entry client, - krb5_db_entry server, krb5_timestamp kdc_time, - const char **status, krb5_pa_data ***e_data) - { -diff --git kdc/tgs_policy.c b/src/kdc/tgs_policy.c -index 33cfbcd81..4c08e44e6 100644 ---- kdc/tgs_policy.c -+++ kdc/tgs_policy.c -@@ -320,7 +320,7 @@ check_tgs_tgt(kdc_realm_t *kdc_active_realm, krb5_kdc_req *req, - - int - validate_tgs_request(kdc_realm_t *kdc_active_realm, -- register krb5_kdc_req *request, krb5_db_entry server, -+ krb5_kdc_req *request, krb5_db_entry server, - krb5_ticket *ticket, krb5_timestamp kdc_time, - const char **status, krb5_pa_data ***e_data) - { -diff --git lib/apputils/net-server.c b/src/lib/apputils/net-server.c -index a40da927e..f0955c503 100644 ---- lib/apputils/net-server.c -+++ lib/apputils/net-server.c -@@ -1452,7 +1452,7 @@ accept_rpc_connection(verto_ctx *ctx, verto_ev *ev) - verto_ev_flag flags; - struct connection *conn; - fd_set fds; -- register int s; -+ int s; - - conn = verto_get_private(ev); - -diff --git lib/crypto/builtin/des/destest.c b/src/lib/crypto/builtin/des/destest.c -index dd2f68ec4..e51351c5e 100644 ---- lib/crypto/builtin/des/destest.c -+++ lib/crypto/builtin/des/destest.c -@@ -159,7 +159,7 @@ convert(text, cblock) - char *text; - unsigned char cblock[]; - { -- register int i; -+ int i; - for (i = 0; i < 8; i++) { - if (!isascii((unsigned char)text[i * 2])) - abort (); -@@ -189,7 +189,7 @@ des_cblock_print_file(x, fp) - FILE *fp; - { - unsigned char *y = (unsigned char *) x; -- register int i = 0; -+ int i = 0; - fprintf(fp," 0x { "); - - while (i++ < 8) { -@@ -212,7 +212,7 @@ des_cblock_print_file(x, fp) - */ - int - mit_des_check_key_parity(key) -- register mit_des_cblock key; -+ mit_des_cblock key; - { - unsigned int i; - -@@ -231,7 +231,7 @@ mit_des_check_key_parity(key) - - void - mit_des_fixup_key_parity(key) -- register mit_des_cblock key; -+ mit_des_cblock key; - { - unsigned int i; - for (i=0; i<sizeof(mit_des_cblock); i++) -diff --git lib/crypto/builtin/des/doc/libdes.doc b/src/lib/crypto/builtin/des/doc/libdes.doc -index 70f9f336a..19c03c1d3 100644 ---- lib/crypto/builtin/des/doc/libdes.doc -+++ lib/crypto/builtin/des/doc/libdes.doc -@@ -157,8 +157,8 @@ int - - int - string_to_key(str,key) -- register char *str; -- register C_Block *key; -+ char *str; -+ C_Block *key; - - This routines converts an arbitrary length, null terminated string - to an 8 byte DES key, with each byte parity set to odd, per FIPS spec. -diff --git lib/crypto/builtin/des/f_cksum.c b/src/lib/crypto/builtin/des/f_cksum.c -index 4492ce6df..cb482b009 100644 ---- lib/crypto/builtin/des/f_cksum.c -+++ lib/crypto/builtin/des/f_cksum.c -@@ -56,7 +56,7 @@ mit_des_cbc_cksum(const krb5_octet *in, krb5_octet *out, - const unsigned DES_INT32 *kp; - const unsigned char *ip; - unsigned char *op; -- register DES_INT32 len; -+ DES_INT32 len; - - /* - * Initialize left and right with the contents of the initial -diff --git lib/crypto/builtin/des/f_sched.c b/src/lib/crypto/builtin/des/f_sched.c -index 89d820f45..666a510fb 100644 ---- lib/crypto/builtin/des/f_sched.c -+++ lib/crypto/builtin/des/f_sched.c -@@ -241,14 +241,14 @@ static const unsigned DES_INT32 PC2_D[4][64] = { - int - mit_des_make_key_sched(mit_des_cblock key, mit_des_key_schedule schedule) - { -- register unsigned DES_INT32 c, d; -+ unsigned DES_INT32 c, d; - - { - /* - * Need a pointer for the keys and a temporary DES_INT32 - */ - const unsigned char *k; -- register unsigned DES_INT32 tmp; -+ unsigned DES_INT32 tmp; - - /* - * Fetch the key into something we can work with -@@ -288,10 +288,10 @@ mit_des_make_key_sched(mit_des_cblock key, mit_des_key_schedule schedule) - /* - * Need several temporaries in here - */ -- register unsigned DES_INT32 ltmp, rtmp; -- register unsigned DES_INT32 *k; -- register int two_bit_shifts; -- register int i; -+ unsigned DES_INT32 ltmp, rtmp; -+ unsigned DES_INT32 *k; -+ int two_bit_shifts; -+ int i; - /* - * Now iterate to compute the key schedule. Note that we - * record the entire set of subkeys in 6 bit chunks since -diff --git lib/crypto/builtin/des/f_tables.h b/src/lib/crypto/builtin/des/f_tables.h -index a99eb0a14..fc91b566c 100644 ---- lib/crypto/builtin/des/f_tables.h -+++ lib/crypto/builtin/des/f_tables.h -@@ -156,7 +156,7 @@ extern const unsigned DES_INT32 des_SP_table[8][64]; - * temporary. Use this more as a guide for rolling your own, though. - * The best way to do the IP depends on the form of the data you - * are dealing with. If you use this, though, try to make left, -- * right and temp register unsigned DES_INT32s. -+ * right and temp unsigned DES_INT32s. - */ - #define DES_INITIAL_PERM(left, right, temp) do { \ - (temp) = DES_IP_RIGHT_BITS((left), (right)); \ -@@ -228,8 +228,8 @@ extern const unsigned DES_INT32 des_SP_table[8][64]; - */ - #define DES_DO_ENCRYPT_1(left, right, kp) \ - do { \ -- register int i; \ -- register unsigned DES_INT32 temp1; \ -+ int i; \ -+ unsigned DES_INT32 temp1; \ - DEB (("do_encrypt %8lX %8lX \n", left, right)); \ - DES_INITIAL_PERM((left), (right), (temp1)); \ - DEB ((" after IP %8lX %8lX\n", left, right)); \ -@@ -246,8 +246,8 @@ extern const unsigned DES_INT32 des_SP_table[8][64]; - - #define DES_DO_DECRYPT_1(left, right, kp) \ - do { \ -- register int i; \ -- register unsigned DES_INT32 temp2; \ -+ int i; \ -+ unsigned DES_INT32 temp2; \ - DES_INITIAL_PERM((left), (right), (temp2)); \ - (kp) += (2 * 16); \ - for (i = 0; i < 8; i++) { \ -diff --git lib/crypto/builtin/des/t_verify.c b/src/lib/crypto/builtin/des/t_verify.c -index 1f3239fed..be0e8adc7 100644 ---- lib/crypto/builtin/des/t_verify.c -+++ lib/crypto/builtin/des/t_verify.c -@@ -339,7 +339,7 @@ void - flip(array) - char *array; - { -- register int old,new,i,j; -+ int old,new,i,j; - /* flips the bit order within each byte from 0 lsb to 0 msb */ - for (i = 0; i<=7; i++) { - old = *array; -diff --git lib/crypto/builtin/md4/md4.c b/src/lib/crypto/builtin/md4/md4.c -index 27d2ad514..f7c16caaa 100644 ---- lib/crypto/builtin/md4/md4.c -+++ lib/crypto/builtin/md4/md4.c -@@ -151,7 +151,7 @@ krb5int_MD4Final (krb5_MD4_CTX *mdContext) - */ - static void Transform (krb5_ui_4 *buf, krb5_ui_4 *in) - { -- register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; -+ krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; - - #if defined(CONFIG_SMALL) && !defined(CONFIG_SMALL_NO_CRYPTO) - int i; -diff --git lib/crypto/builtin/md5/md5.c b/src/lib/crypto/builtin/md5/md5.c -index 4a169065c..a5e0c82db 100644 ---- lib/crypto/builtin/md5/md5.c -+++ lib/crypto/builtin/md5/md5.c -@@ -189,7 +189,7 @@ krb5int_MD5Final (krb5_MD5_CTX *mdContext) - */ - static void Transform (krb5_ui_4 *buf, krb5_ui_4 *in) - { -- register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; -+ krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; - - #if defined(CONFIG_SMALL) && !defined(CONFIG_SMALL_NO_CRYPTO) - -diff --git lib/crypto/krb/crc32.c b/src/lib/crypto/krb/crc32.c -index d3b1b7a13..11fe312da 100644 ---- lib/crypto/krb/crc32.c -+++ lib/crypto/krb/crc32.c -@@ -148,9 +148,9 @@ static u_long const crc_table[256] = { - void - mit_crc32(krb5_pointer in, size_t in_length, unsigned long *cksum) - { -- register u_char *data; -- register u_long c = *cksum; -- register int idx; -+ u_char *data; -+ u_long c = *cksum; -+ int idx; - size_t i; - - data = (u_char *)in; -diff --git lib/crypto/krb/keyblocks.c b/src/lib/crypto/krb/keyblocks.c -index 98696f508..1126d0a0a 100644 ---- lib/crypto/krb/keyblocks.c -+++ lib/crypto/krb/keyblocks.c -@@ -56,7 +56,7 @@ krb5int_c_init_keyblock(krb5_context context, krb5_enctype enctype, - } - - void --krb5int_c_free_keyblock(krb5_context context, register krb5_keyblock *val) -+krb5int_c_free_keyblock(krb5_context context, krb5_keyblock *val) - { - krb5int_c_free_keyblock_contents(context, val); - free(val); -diff --git lib/kdb/iprop_xdr.c b/src/lib/kdb/iprop_xdr.c -index 8bf2c89e6..b866fdf7b 100644 ---- lib/kdb/iprop_xdr.c -+++ lib/kdb/iprop_xdr.c -@@ -12,7 +12,7 @@ - static bool_t - xdr_int16_t (XDR *xdrs, int16_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_short (xdrs, objp)) - return FALSE; -@@ -22,7 +22,7 @@ xdr_int16_t (XDR *xdrs, int16_t *objp) - static bool_t - xdr_int32_t (XDR *xdrs, int32_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_int (xdrs, objp)) - return FALSE; -@@ -32,7 +32,7 @@ xdr_int32_t (XDR *xdrs, int32_t *objp) - static bool_t - xdr_uint32_t (XDR *xdrs, uint32_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_u_int (xdrs, objp)) - return FALSE; -@@ -42,7 +42,7 @@ xdr_uint32_t (XDR *xdrs, uint32_t *objp) - bool_t - xdr_utf8str_t (XDR *xdrs, utf8str_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_bytes (xdrs, (char **)&objp->utf8str_t_val, (u_int *) &objp->utf8str_t_len, ~0)) - return FALSE; -@@ -52,7 +52,7 @@ xdr_utf8str_t (XDR *xdrs, utf8str_t *objp) - bool_t - xdr_kdb_sno_t (XDR *xdrs, kdb_sno_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_uint32_t (xdrs, objp)) - return FALSE; -@@ -62,7 +62,7 @@ xdr_kdb_sno_t (XDR *xdrs, kdb_sno_t *objp) - bool_t - xdr_kdbe_time_t (XDR *xdrs, kdbe_time_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_uint32_t (xdrs, &objp->seconds)) - return FALSE; -@@ -74,7 +74,7 @@ xdr_kdbe_time_t (XDR *xdrs, kdbe_time_t *objp) - bool_t - xdr_kdbe_key_t (XDR *xdrs, kdbe_key_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_int32_t (xdrs, &objp->k_ver)) - return FALSE; -@@ -92,7 +92,7 @@ xdr_kdbe_key_t (XDR *xdrs, kdbe_key_t *objp) - bool_t - xdr_kdbe_data_t (XDR *xdrs, kdbe_data_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_int32_t (xdrs, &objp->k_magic)) - return FALSE; -@@ -104,7 +104,7 @@ xdr_kdbe_data_t (XDR *xdrs, kdbe_data_t *objp) - bool_t - xdr_kdbe_princ_t (XDR *xdrs, kdbe_princ_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_utf8str_t (xdrs, &objp->k_realm)) - return FALSE; -@@ -119,7 +119,7 @@ xdr_kdbe_princ_t (XDR *xdrs, kdbe_princ_t *objp) - bool_t - xdr_kdbe_tl_t (XDR *xdrs, kdbe_tl_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_int16_t (xdrs, &objp->tl_type)) - return FALSE; -@@ -131,7 +131,7 @@ xdr_kdbe_tl_t (XDR *xdrs, kdbe_tl_t *objp) - bool_t - xdr_kdbe_pw_hist_t (XDR *xdrs, kdbe_pw_hist_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_array (xdrs, (char **)&objp->kdbe_pw_hist_t_val, (u_int *) &objp->kdbe_pw_hist_t_len, ~0, - sizeof (kdbe_key_t), (xdrproc_t) xdr_kdbe_key_t)) -@@ -142,7 +142,7 @@ xdr_kdbe_pw_hist_t (XDR *xdrs, kdbe_pw_hist_t *objp) - bool_t - xdr_kdbe_attr_type_t (XDR *xdrs, kdbe_attr_type_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_enum (xdrs, (enum_t *) objp)) - return FALSE; -@@ -152,7 +152,7 @@ xdr_kdbe_attr_type_t (XDR *xdrs, kdbe_attr_type_t *objp) - bool_t - xdr_kdbe_val_t (XDR *xdrs, kdbe_val_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_kdbe_attr_type_t (xdrs, &objp->av_type)) - return FALSE; -@@ -251,7 +251,7 @@ xdr_kdbe_val_t (XDR *xdrs, kdbe_val_t *objp) - bool_t - xdr_kdbe_t (XDR *xdrs, kdbe_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_array (xdrs, (char **)&objp->kdbe_t_val, (u_int *) &objp->kdbe_t_len, ~0, - sizeof (kdbe_val_t), (xdrproc_t) xdr_kdbe_val_t)) -@@ -262,7 +262,7 @@ xdr_kdbe_t (XDR *xdrs, kdbe_t *objp) - bool_t - xdr_kdb_incr_update_t (XDR *xdrs, kdb_incr_update_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_utf8str_t (xdrs, &objp->kdb_princ_name)) - return FALSE; -@@ -287,7 +287,7 @@ xdr_kdb_incr_update_t (XDR *xdrs, kdb_incr_update_t *objp) - bool_t - xdr_kdb_ulog_t (XDR *xdrs, kdb_ulog_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_array (xdrs, (char **)&objp->kdb_ulog_t_val, (u_int *) &objp->kdb_ulog_t_len, ~0, - sizeof (kdb_incr_update_t), (xdrproc_t) xdr_kdb_incr_update_t)) -@@ -298,7 +298,7 @@ xdr_kdb_ulog_t (XDR *xdrs, kdb_ulog_t *objp) - bool_t - xdr_update_status_t (XDR *xdrs, update_status_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_enum (xdrs, (enum_t *) objp)) - return FALSE; -@@ -308,7 +308,7 @@ xdr_update_status_t (XDR *xdrs, update_status_t *objp) - bool_t - xdr_kdb_last_t (XDR *xdrs, kdb_last_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_kdb_sno_t (xdrs, &objp->last_sno)) - return FALSE; -@@ -320,7 +320,7 @@ xdr_kdb_last_t (XDR *xdrs, kdb_last_t *objp) - bool_t - xdr_kdb_incr_result_t (XDR *xdrs, kdb_incr_result_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_kdb_last_t (xdrs, &objp->lastentry)) - return FALSE; -@@ -334,7 +334,7 @@ xdr_kdb_incr_result_t (XDR *xdrs, kdb_incr_result_t *objp) - bool_t - xdr_kdb_fullresync_result_t (XDR *xdrs, kdb_fullresync_result_t *objp) - { -- register int32_t *buf; -+ int32_t *buf; - - if (!xdr_kdb_last_t (xdrs, &objp->lastentry)) - return FALSE; -diff --git lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c -index 030098360..0d00c86d4 100644 ---- lib/krb5/ccache/cc_mslsa.c -+++ lib/krb5/ccache/cc_mslsa.c -@@ -1638,8 +1638,8 @@ krb5_lcc_initialize(krb5_context context, krb5_ccache id, krb5_principal princ) - static krb5_error_code KRB5_CALLCONV - krb5_lcc_close(krb5_context context, krb5_ccache id) - { -- register int closeval = KRB5_OK; -- register krb5_lcc_data *data; -+ int closeval = KRB5_OK; -+ krb5_lcc_data *data; - - if (id) { - data = (krb5_lcc_data *) id->data; -@@ -1665,7 +1665,7 @@ krb5_lcc_close(krb5_context context, krb5_ccache id) - static krb5_error_code KRB5_CALLCONV - krb5_lcc_destroy(krb5_context context, krb5_ccache id) - { -- register krb5_lcc_data *data; -+ krb5_lcc_data *data; - - if (id) { - data = (krb5_lcc_data *) id->data; -diff --git lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c -index 6092ee432..62d847c18 100644 ---- lib/krb5/ccache/ccapi/stdcc_util.c -+++ lib/krb5/ccache/ccapi/stdcc_util.c -@@ -921,8 +921,8 @@ cc_int32 krb5int_free_cc_cred_union (cred_union** creds) - */ - static krb5_boolean - times_match(t1, t2) -- register const krb5_ticket_times *t1; -- register const krb5_ticket_times *t2; -+ const krb5_ticket_times *t1; -+ const krb5_ticket_times *t2; - { - if (t1->renew_till) { - if (ts_after(t1->renew_till, t2->renew_till)) -@@ -938,7 +938,7 @@ times_match(t1, t2) - - static krb5_boolean - times_match_exact (t1, t2) -- register const krb5_ticket_times *t1, *t2; -+ const krb5_ticket_times *t1, *t2; - { - return (t1->authtime == t2->authtime - && t1->starttime == t2->starttime -@@ -949,7 +949,7 @@ times_match_exact (t1, t2) - static krb5_boolean - standard_fields_match(context, mcreds, creds) - krb5_context context; -- register const krb5_creds *mcreds, *creds; -+ const krb5_creds *mcreds, *creds; - { - return (krb5_principal_compare(context, mcreds->client,creds->client) && - krb5_principal_compare(context, mcreds->server,creds->server)); -@@ -960,7 +960,7 @@ standard_fields_match(context, mcreds, creds) - static krb5_boolean - srvname_match(context, mcreds, creds) - krb5_context context; -- register const krb5_creds *mcreds, *creds; -+ const krb5_creds *mcreds, *creds; - { - krb5_boolean retval; - krb5_principal_data p1, p2; -@@ -1008,7 +1008,7 @@ authdata_match(mdata, data) - - static krb5_boolean - data_match(data1, data2) -- register const krb5_data *data1, *data2; -+ const krb5_data *data1, *data2; - { - if (!data1) { - if (!data2) -diff --git lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c -index 091f2c43f..89cb68680 100644 ---- lib/krb5/keytab/kt_file.c -+++ lib/krb5/keytab/kt_file.c -@@ -1182,7 +1182,7 @@ krb5_ktfileint_internal_read_entry(krb5_context context, krb5_keytab id, krb5_ke - unsigned int u_count, u_princ_size; - krb5_int16 enctype; - krb5_int16 princ_size; -- register int i; -+ int i; - krb5_int32 size; - krb5_int32 start_pos, pos; - krb5_error_code error; -diff --git lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c -index e9ea0ba8c..39c9e1e69 100644 ---- lib/krb5/krb/addr_order.c -+++ lib/krb5/krb/addr_order.c -@@ -38,7 +38,7 @@ int KRB5_CALLCONV - krb5_address_order(krb5_context context, const krb5_address *addr1, const krb5_address *addr2) - { - int dir; -- register int i; -+ int i; - const int minlen = min(addr1->length, addr2->length); - - if (addr1->addrtype != addr2->addrtype) -diff --git lib/krb5/krb/authdata.c b/src/lib/krb5/krb/authdata.c -index abb2ab9e2..8fd1f0538 100644 ---- lib/krb5/krb/authdata.c -+++ lib/krb5/krb/authdata.c -@@ -1299,7 +1299,7 @@ krb5int_copy_authdatum(krb5_context context, - void KRB5_CALLCONV - krb5_free_authdata(krb5_context context, krb5_authdata **val) - { -- register krb5_authdata **temp; -+ krb5_authdata **temp; - - if (val == NULL) - return; -diff --git lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c -index c33c67dda..78fc2f4c6 100644 ---- lib/krb5/krb/conv_princ.c -+++ lib/krb5/krb/conv_princ.c -@@ -130,8 +130,8 @@ static const struct krb_convert sconv_list[] = { - * This falls in the "should have been in the ANSI C library" - * category. :-) - */ --static char *strnchr(register char *s, register int c, -- register unsigned int n) -+static char * -+strnchr(char *s, int c, unsigned int n) - { - if (n < 1) - return 0; -diff --git lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c -index 494bccf92..9c9bc7ba3 100644 ---- lib/krb5/krb/copy_addrs.c -+++ lib/krb5/krb/copy_addrs.c -@@ -51,7 +51,7 @@ krb5_copy_addresses(krb5_context context, krb5_address *const *inaddr, krb5_addr - { - krb5_error_code retval; - krb5_address ** tempaddr; -- register unsigned int nelems = 0; -+ unsigned int nelems = 0; - - if (!inaddr) { - *outaddr = 0; -diff --git lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c -index 06a06450c..ffb7ee9c6 100644 ---- lib/krb5/krb/copy_auth.c -+++ lib/krb5/krb/copy_auth.c -@@ -65,7 +65,7 @@ krb5_merge_authdata(krb5_context context, - { - krb5_error_code retval; - krb5_authdata ** tempauthdat; -- register unsigned int nelems = 0, nelems2 = 0; -+ unsigned int nelems = 0, nelems2 = 0; - - *outauthdat = NULL; - if (!inauthdat1 && !inauthdat2) { -diff --git lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c -index 0d0e6a004..81b338124 100644 ---- lib/krb5/krb/copy_princ.c -+++ lib/krb5/krb/copy_princ.c -@@ -32,7 +32,7 @@ - krb5_error_code KRB5_CALLCONV - krb5_copy_principal(krb5_context context, krb5_const_principal inprinc, krb5_principal *outprinc) - { -- register krb5_principal tempprinc; -+ krb5_principal tempprinc; - krb5_int32 i; - - tempprinc = (krb5_principal)malloc(sizeof(krb5_principal_data)); -diff --git lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c -index 51f9e8fdf..e848554e2 100644 ---- lib/krb5/krb/decrypt_tk.c -+++ lib/krb5/krb/decrypt_tk.c -@@ -36,7 +36,8 @@ - */ - - krb5_error_code KRB5_CALLCONV --krb5_decrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key, register krb5_ticket *ticket) -+krb5_decrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key, -+ krb5_ticket *ticket) - { - krb5_enc_tkt_part *dec_tkt_part; - krb5_data scratch; -diff --git lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c -index 7fcd0ffc8..13a774f07 100644 ---- lib/krb5/krb/encrypt_tk.c -+++ lib/krb5/krb/encrypt_tk.c -@@ -39,11 +39,12 @@ - */ - - krb5_error_code --krb5_encrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key, register krb5_ticket *dec_ticket) -+krb5_encrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key, -+ krb5_ticket *dec_ticket) - { - krb5_data *scratch; - krb5_error_code retval; -- register krb5_enc_tkt_part *dec_tkt_part = dec_ticket->enc_part2; -+ krb5_enc_tkt_part *dec_tkt_part = dec_ticket->enc_part2; - - /* start by encoding the to-be-encrypted part. */ - if ((retval = encode_krb5_enc_tkt_part(dec_tkt_part, &scratch))) { -diff --git lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c -index 71e7fcad0..ab2409f17 100644 ---- lib/krb5/krb/kfree.c -+++ lib/krb5/krb/kfree.c -@@ -66,7 +66,7 @@ krb5_free_address(krb5_context context, krb5_address *val) - void KRB5_CALLCONV - krb5_free_addresses(krb5_context context, krb5_address **val) - { -- register krb5_address **temp; -+ krb5_address **temp; - - if (val == NULL) - return; -@@ -78,7 +78,7 @@ krb5_free_addresses(krb5_context context, krb5_address **val) - } - - void KRB5_CALLCONV --krb5_free_ap_rep(krb5_context context, register krb5_ap_rep *val) -+krb5_free_ap_rep(krb5_context context, krb5_ap_rep *val) - { - if (val == NULL) - return; -@@ -87,7 +87,7 @@ krb5_free_ap_rep(krb5_context context, register krb5_ap_rep *val) - } - - void KRB5_CALLCONV --krb5_free_ap_req(krb5_context context, register krb5_ap_req *val) -+krb5_free_ap_req(krb5_context context, krb5_ap_req *val) - { - if (val == NULL) - return; -@@ -130,7 +130,7 @@ krb5_free_authenticator(krb5_context context, krb5_authenticator *val) - } - - void KRB5_CALLCONV --krb5_free_checksum(krb5_context context, register krb5_checksum *val) -+krb5_free_checksum(krb5_context context, krb5_checksum *val) - { - if (val == NULL) - return; -@@ -139,7 +139,7 @@ krb5_free_checksum(krb5_context context, register krb5_checksum *val) - } - - void KRB5_CALLCONV --krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val) -+krb5_free_checksum_contents(krb5_context context, krb5_checksum *val) - { - if (val == NULL) - return; -@@ -148,7 +148,7 @@ krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val) - } - - void KRB5_CALLCONV --krb5_free_cred(krb5_context context, register krb5_cred *val) -+krb5_free_cred(krb5_context context, krb5_cred *val) - { - if (val == NULL) - return; -@@ -183,9 +183,9 @@ krb5_free_cred_contents(krb5_context context, krb5_creds *val) - } - - void KRB5_CALLCONV --krb5_free_cred_enc_part(krb5_context context, register krb5_cred_enc_part *val) -+krb5_free_cred_enc_part(krb5_context context, krb5_cred_enc_part *val) - { -- register krb5_cred_info **temp; -+ krb5_cred_info **temp; - - if (val == NULL) - return; -@@ -273,7 +273,7 @@ void krb5_free_etype_info(krb5_context context, krb5_etype_info info) - - - void KRB5_CALLCONV --krb5_free_enc_kdc_rep_part(krb5_context context, register krb5_enc_kdc_rep_part *val) -+krb5_free_enc_kdc_rep_part(krb5_context context, krb5_enc_kdc_rep_part *val) - { - if (val == NULL) - return; -@@ -300,7 +300,7 @@ krb5_free_enc_tkt_part(krb5_context context, krb5_enc_tkt_part *val) - - - void KRB5_CALLCONV --krb5_free_error(krb5_context context, register krb5_error *val) -+krb5_free_error(krb5_context context, krb5_error *val) - { - if (val == NULL) - return; -@@ -342,13 +342,13 @@ krb5_free_kdc_req(krb5_context context, krb5_kdc_req *val) - } - - void KRB5_CALLCONV --krb5_free_keyblock_contents(krb5_context context, register krb5_keyblock *key) -+krb5_free_keyblock_contents(krb5_context context, krb5_keyblock *key) - { - krb5int_c_free_keyblock_contents (context, key); - } - - void KRB5_CALLCONV --krb5_free_keyblock(krb5_context context, register krb5_keyblock *val) -+krb5_free_keyblock(krb5_context context, krb5_keyblock *val) - { - krb5int_c_free_keyblock (context, val); - } -@@ -358,7 +358,7 @@ krb5_free_keyblock(krb5_context context, register krb5_keyblock *val) - void KRB5_CALLCONV - krb5_free_last_req(krb5_context context, krb5_last_req_entry **val) - { -- register krb5_last_req_entry **temp; -+ krb5_last_req_entry **temp; - - if (val == NULL) - return; -@@ -384,7 +384,7 @@ k5_zapfree_pa_data(krb5_pa_data **val) - void KRB5_CALLCONV - krb5_free_pa_data(krb5_context context, krb5_pa_data **val) - { -- register krb5_pa_data **temp; -+ krb5_pa_data **temp; - - if (val == NULL) - return; -@@ -398,7 +398,7 @@ krb5_free_pa_data(krb5_context context, krb5_pa_data **val) - void KRB5_CALLCONV - krb5_free_principal(krb5_context context, krb5_principal val) - { -- register krb5_int32 i; -+ krb5_int32 i; - - if (!val) - return; -@@ -414,7 +414,7 @@ krb5_free_principal(krb5_context context, krb5_principal val) - } - - void KRB5_CALLCONV --krb5_free_priv(krb5_context context, register krb5_priv *val) -+krb5_free_priv(krb5_context context, krb5_priv *val) - { - if (val == NULL) - return; -@@ -423,7 +423,7 @@ krb5_free_priv(krb5_context context, register krb5_priv *val) - } - - void KRB5_CALLCONV --krb5_free_priv_enc_part(krb5_context context, register krb5_priv_enc_part *val) -+krb5_free_priv_enc_part(krb5_context context, krb5_priv_enc_part *val) - { - if (val == NULL) - return; -@@ -434,7 +434,7 @@ krb5_free_priv_enc_part(krb5_context context, register krb5_priv_enc_part *val) - } - - void KRB5_CALLCONV --krb5_free_safe(krb5_context context, register krb5_safe *val) -+krb5_free_safe(krb5_context context, krb5_safe *val) - { - if (val == NULL) - return; -@@ -460,7 +460,7 @@ krb5_free_ticket(krb5_context context, krb5_ticket *val) - void KRB5_CALLCONV - krb5_free_tickets(krb5_context context, krb5_ticket **val) - { -- register krb5_ticket **temp; -+ krb5_ticket **temp; - - if (val == NULL) - return; -@@ -473,7 +473,7 @@ krb5_free_tickets(krb5_context context, krb5_ticket **val) - void KRB5_CALLCONV - krb5_free_tgt_creds(krb5_context context, krb5_creds **tgts) - { -- register krb5_creds **tgtpp; -+ krb5_creds **tgtpp; - if (tgts == NULL) - return; - for (tgtpp = tgts; *tgtpp; tgtpp++) -diff --git lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c -index 00d0c734f..7bcb62769 100644 ---- lib/krb5/krb/pr_to_salt.c -+++ lib/krb5/krb/pr_to_salt.c -@@ -34,8 +34,7 @@ principal2salt_internal(krb5_context, krb5_const_principal, - * Convert a krb5_principal into the default salt for that principal. - */ - static krb5_error_code --principal2salt_internal(krb5_context context, -- register krb5_const_principal pr, -+principal2salt_internal(krb5_context context, krb5_const_principal pr, - krb5_data *ret, int use_realm) - { - unsigned int size = 0, offset=0; -@@ -69,15 +68,15 @@ principal2salt_internal(krb5_context context, - } - - krb5_error_code --krb5_principal2salt(krb5_context context, -- register krb5_const_principal pr, krb5_data *ret) -+krb5_principal2salt(krb5_context context, krb5_const_principal pr, -+ krb5_data *ret) - { - return principal2salt_internal(context, pr, ret, 1); - } - - krb5_error_code --krb5_principal2salt_norealm(krb5_context context, -- register krb5_const_principal pr, krb5_data *ret) -+krb5_principal2salt_norealm(krb5_context context, krb5_const_principal pr, -+ krb5_data *ret) - { - return principal2salt_internal(context, pr, ret, 0); - } -diff --git lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c -index 5bb64d00a..6a54b222e 100644 ---- lib/krb5/krb/unparse.c -+++ lib/krb5/krb/unparse.c -@@ -225,7 +225,8 @@ cleanup: - } - - krb5_error_code KRB5_CALLCONV --krb5_unparse_name(krb5_context context, krb5_const_principal principal, register char **name) -+krb5_unparse_name(krb5_context context, krb5_const_principal principal, -+ char **name) - { - if (name != NULL) /* name == NULL will return error from _ext */ - *name = NULL; -diff --git lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c -index f4e8e35f5..4074fe888 100644 ---- lib/krb5/krb/walk_rtree.c -+++ lib/krb5/krb/walk_rtree.c -@@ -615,7 +615,7 @@ comtail(struct hstate *c, struct hstate *s, int sep) - void - krb5_free_realm_tree(krb5_context context, krb5_principal *realms) - { -- register krb5_principal *nrealms = realms; -+ krb5_principal *nrealms = realms; - if (realms == NULL) - return; - while (*nrealms) { -diff --git lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c -index 0863caba5..61fc74b61 100644 ---- lib/krb5/os/full_ipadr.c -+++ lib/krb5/os/full_ipadr.c -@@ -36,8 +36,8 @@ krb5_make_full_ipaddr(krb5_context context, krb5_int32 adr, - { - unsigned long smushaddr = (unsigned long) adr; /* already in net order */ - unsigned short smushport = (unsigned short) port; /* ditto */ -- register krb5_address *retaddr; -- register krb5_octet *marshal; -+ krb5_address *retaddr; -+ krb5_octet *marshal; - krb5_addrtype temptype; - krb5_int32 templength; - -diff --git lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c -index 2577df301..c7a6ddd52 100644 ---- lib/krb5/os/mk_faddr.c -+++ lib/krb5/os/mk_faddr.c -@@ -38,7 +38,7 @@ krb5_error_code - krb5_make_fulladdr(krb5_context context, krb5_address *kaddr, - krb5_address *kport, krb5_address *raddr) - { -- register krb5_octet * marshal; -+ krb5_octet *marshal; - krb5_int32 tmp32; - krb5_int16 tmp16; - -diff --git lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c -index 7e5e95412..64a462269 100644 ---- lib/krb5/os/net_read.c -+++ lib/krb5/os/net_read.c -@@ -37,7 +37,7 @@ - */ - - int --krb5_net_read(krb5_context context, int fd, register char *buf, register int len) -+krb5_net_read(krb5_context context, int fd, char *buf, int len) - { - int cc, len2 = 0; - -diff --git lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c -index 905d60f19..94c0430f1 100644 ---- lib/krb5/os/port2ip.c -+++ lib/krb5/os/port2ip.c -@@ -34,7 +34,7 @@ krb5_unpack_full_ipaddr(krb5_context context, const krb5_address *inaddr, krb5_i - { - unsigned long smushaddr; - unsigned short smushport; -- register krb5_octet *marshal; -+ krb5_octet *marshal; - krb5_addrtype temptype; - krb5_ui_4 templength; - -diff --git lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c -index d4e36b1c7..82fde9250 100644 ---- lib/krb5/os/timeofday.c -+++ lib/krb5/os/timeofday.c -@@ -29,7 +29,7 @@ - #include <time.h> - - krb5_error_code KRB5_CALLCONV --krb5_timeofday(krb5_context context, register krb5_timestamp *timeret) -+krb5_timeofday(krb5_context context, krb5_timestamp *timeret) - { - krb5_os_context os_ctx; - time_t tval; -diff --git lib/rpc/auth_none.c b/src/lib/rpc/auth_none.c -index de8d6d048..85ddbf7b4 100644 ---- lib/rpc/auth_none.c -+++ lib/rpc/auth_none.c -@@ -76,9 +76,9 @@ static struct authnone_private { - AUTH * - authnone_create(void) - { -- register struct authnone_private *ap = authnone_private; -+ struct authnone_private *ap = authnone_private; - XDR xdr_stream; -- register XDR *xdrs; -+ XDR *xdrs; - - if (ap == 0) { - ap = (struct authnone_private *)calloc(1, sizeof (*ap)); -@@ -104,7 +104,7 @@ authnone_create(void) - static bool_t - authnone_marshal(AUTH *client, XDR *xdrs) - { -- register struct authnone_private *ap = authnone_private; -+ struct authnone_private *ap = authnone_private; - - if (ap == 0) - return (0); -diff --git lib/rpc/auth_unix.c b/src/lib/rpc/auth_unix.c -index 6cb998dc5..7853efa39 100644 ---- lib/rpc/auth_unix.c -+++ lib/rpc/auth_unix.c -@@ -99,15 +99,15 @@ authunix_create( - char *machname, - int uid, - int gid, -- register int len, -+ int len, - int *aup_gids) - { - struct authunix_parms aup; - char mymem[MAX_AUTH_BYTES]; - struct timeval now; - XDR xdrs; -- register AUTH *auth; -- register struct audata *au; -+ AUTH *auth; -+ struct audata *au; - - /* - * Allocate and set up auth handle -@@ -175,10 +175,10 @@ authunix_create( - AUTH * - authunix_create_default(void) - { -- register int len; -+ int len; - char machname[MAX_MACHINE_NAME + 1]; -- register int uid; -- register int gid; -+ int uid; -+ int gid; - GETGROUPS_T gids[NGRPS]; - int igids[NGRPS], i; - -@@ -208,15 +208,15 @@ authunix_nextverf(AUTH *auth) - static bool_t - authunix_marshal(AUTH *auth, XDR *xdrs) - { -- register struct audata *au = AUTH_PRIVATE(auth); -+ struct audata *au = AUTH_PRIVATE(auth); - - return (XDR_PUTBYTES(xdrs, au->au_marshed, au->au_mpos)); - } - - static bool_t --authunix_validate(register AUTH *auth, struct opaque_auth *verf) -+authunix_validate(AUTH *auth, struct opaque_auth *verf) - { -- register struct audata *au; -+ struct audata *au; - XDR xdrs; - - if (verf->oa_flavor == AUTH_SHORT) { -@@ -242,13 +242,13 @@ authunix_validate(register AUTH *auth, struct opaque_auth *verf) - } - - static bool_t --authunix_refresh(register AUTH *auth, struct rpc_msg *msg) -+authunix_refresh(AUTH *auth, struct rpc_msg *msg) - { -- register struct audata *au = AUTH_PRIVATE(auth); -+ struct audata *au = AUTH_PRIVATE(auth); - struct authunix_parms aup; - struct timeval now; - XDR xdrs; -- register int stat; -+ int stat; - - if (auth->ah_cred.oa_base == au->au_origcred.oa_base) { - /* there is no hope. Punt */ -@@ -284,9 +284,9 @@ done: - } - - static void --authunix_destroy(register AUTH *auth) -+authunix_destroy(AUTH *auth) - { -- register struct audata *au = AUTH_PRIVATE(auth); -+ struct audata *au = AUTH_PRIVATE(auth); - - mem_free(au->au_origcred.oa_base, au->au_origcred.oa_length); - -@@ -306,11 +306,11 @@ authunix_destroy(register AUTH *auth) - * sets private data, au_marshed and au_mpos - */ - static void --marshal_new_auth(register AUTH *auth) -+marshal_new_auth(AUTH *auth) - { - XDR xdr_stream; -- register XDR *xdrs = &xdr_stream; -- register struct audata *au = AUTH_PRIVATE(auth); -+ XDR *xdrs = &xdr_stream; -+ struct audata *au = AUTH_PRIVATE(auth); - - xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE); - if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) || -diff --git lib/rpc/authunix_prot.c b/src/lib/rpc/authunix_prot.c -index 5bc5172ef..512d5a51b 100644 ---- lib/rpc/authunix_prot.c -+++ lib/rpc/authunix_prot.c -@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro"; - * XDR for unix authentication parameters. - */ - bool_t --xdr_authunix_parms(register XDR *xdrs, register struct authunix_parms *p) -+xdr_authunix_parms(XDR *xdrs, struct authunix_parms *p) - { - - if (xdr_u_int32(xdrs, &(p->aup_time)) -diff --git lib/rpc/clnt_raw.c b/src/lib/rpc/clnt_raw.c -index 1d7fc6260..515086bb5 100644 ---- lib/rpc/clnt_raw.c -+++ lib/rpc/clnt_raw.c -@@ -140,8 +140,8 @@ clntraw_call( - void * resultsp, - struct timeval timeout) - { -- register struct clntraw_private *clp = clntraw_private; -- register XDR *xdrs = &clp->xdr_stream; -+ struct clntraw_private *clp = clntraw_private; -+ XDR *xdrs = &clp->xdr_stream; - struct rpc_msg msg; - enum clnt_stat status; - struct rpc_err error; -@@ -236,8 +236,8 @@ clntraw_freeres( - xdrproc_t xdr_res, - void *res_ptr) - { -- register struct clntraw_private *clp = clntraw_private; -- register XDR *xdrs = &clp->xdr_stream; -+ struct clntraw_private *clp = clntraw_private; -+ XDR *xdrs = &clp->xdr_stream; - bool_t rval; - - if (clp == 0) -diff --git lib/rpc/clnt_simple.c b/src/lib/rpc/clnt_simple.c -index 4ec99edd8..39186e583 100644 ---- lib/rpc/clnt_simple.c -+++ lib/rpc/clnt_simple.c -@@ -70,7 +70,7 @@ callrpc( - xdrproc_t outproc, - char *out) - { -- register struct callrpc_private *crp = callrpc_private; -+ struct callrpc_private *crp = callrpc_private; - struct sockaddr_in server_addr; - enum clnt_stat clnt_stat; - struct hostent *hp; -diff --git lib/rpc/clnt_tcp.c b/src/lib/rpc/clnt_tcp.c -index 02056fd40..87761906c 100644 ---- lib/rpc/clnt_tcp.c -+++ lib/rpc/clnt_tcp.c -@@ -130,7 +130,7 @@ clnttcp_create( - u_int recvsz) - { - CLIENT *h; -- register struct ct_data *ct = 0; -+ struct ct_data *ct = 0; - struct timeval now; - struct rpc_msg call_msg; - -@@ -244,7 +244,7 @@ fooy: - - static enum clnt_stat - clnttcp_call( -- register CLIENT *h, -+ CLIENT *h, - rpcproc_t proc, - xdrproc_t xdr_args, - void * args_ptr, -@@ -252,12 +252,12 @@ clnttcp_call( - void * results_ptr, - struct timeval timeout) - { -- register struct ct_data *ct = (struct ct_data *) h->cl_private; -- register XDR *xdrs = &(ct->ct_xdrs); -+ struct ct_data *ct = h->cl_private; -+ XDR *xdrs = &ct->ct_xdrs; - struct rpc_msg reply_msg; - uint32_t x_id; - uint32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ -- register bool_t shipnow; -+ bool_t shipnow; - int refreshes = 2; - long procl = proc; - -@@ -356,8 +356,7 @@ clnttcp_geterr( - CLIENT *h, - struct rpc_err *errp) - { -- register struct ct_data *ct = -- (struct ct_data *) h->cl_private; -+ struct ct_data *ct = h->cl_private; - - *errp = ct->ct_error; - } -@@ -368,8 +367,8 @@ clnttcp_freeres( - xdrproc_t xdr_res, - void * res_ptr) - { -- register struct ct_data *ct = (struct ct_data *)cl->cl_private; -- register XDR *xdrs = &(ct->ct_xdrs); -+ struct ct_data *ct = cl->cl_private; -+ XDR *xdrs = &ct->ct_xdrs; - - xdrs->x_op = XDR_FREE; - return ((*xdr_res)(xdrs, res_ptr)); -@@ -387,7 +386,7 @@ clnttcp_control( - int request, - void *info) - { -- register struct ct_data *ct = (struct ct_data *)cl->cl_private; -+ struct ct_data *ct = cl->cl_private; - GETSOCKNAME_ARG3_TYPE len; - - switch (request) { -@@ -417,8 +416,7 @@ clnttcp_control( - static void - clnttcp_destroy(CLIENT *h) - { -- register struct ct_data *ct = -- (struct ct_data *) h->cl_private; -+ struct ct_data *ct = h->cl_private; - - if (ct->ct_closeit) - (void)closesocket(ct->ct_sock); -@@ -436,9 +434,9 @@ static int - readtcp( - char *ctptr, - caddr_t buf, -- register int len) -+ int len) - { -- register struct ct_data *ct = (struct ct_data *)(void *)ctptr; -+ struct ct_data *ct = (void *)ctptr; - struct timeval tout; - #ifdef FD_SETSIZE - fd_set mask; -@@ -449,7 +447,7 @@ readtcp( - FD_ZERO(&mask); - FD_SET(ct->ct_sock, &mask); - #else -- register int mask = 1 << (ct->ct_sock); -+ int mask = 1 << (ct->ct_sock); - int readfds; - - if (len == 0) -@@ -498,7 +496,7 @@ writetcp( - int len) - { - struct ct_data *ct = (struct ct_data *)(void *)ctptr; -- register int i, cnt; -+ int i, cnt; - - for (cnt = len; cnt > 0; cnt -= i, buf += i) { - if ((i = write(ct->ct_sock, buf, (size_t) cnt)) == -1) { -diff --git lib/rpc/clnt_udp.c b/src/lib/rpc/clnt_udp.c -index 7a5191659..3d7a459d1 100644 ---- lib/rpc/clnt_udp.c -+++ lib/rpc/clnt_udp.c -@@ -121,12 +121,12 @@ clntudp_bufcreate( - rpcprog_t program, - rpcvers_t version, - struct timeval wait, -- register int *sockp, -+ int *sockp, - u_int sendsz, - u_int recvsz) - { - CLIENT *cl; -- register struct cu_data *cu = 0; -+ struct cu_data *cu = 0; - struct timeval now; - struct rpc_msg call_msg; - -@@ -217,7 +217,7 @@ clntudp_create( - rpcprog_t program, - rpcvers_t version, - struct timeval wait, -- register int *sockp) -+ int *sockp) - { - - return(clntudp_bufcreate(raddr, program, version, wait, sockp, -@@ -226,7 +226,7 @@ clntudp_create( - - static enum clnt_stat - clntudp_call( -- register CLIENT *cl, /* client handle */ -+ CLIENT *cl, /* client handle */ - rpcproc_t proc, /* procedure number */ - xdrproc_t xargs, /* xdr routine for args */ - void * argsp, /* pointer to args */ -@@ -236,17 +236,17 @@ clntudp_call( - * giving up */ - ) - { -- register struct cu_data *cu = (struct cu_data *)cl->cl_private; -- register XDR *xdrs; -- register int outlen; -- register ssize_t inlen; -+ struct cu_data *cu = (struct cu_data *)cl->cl_private; -+ XDR *xdrs; -+ int outlen; -+ ssize_t inlen; - GETSOCKNAME_ARG3_TYPE fromlen; /* Assumes recvfrom uses same type */ - #ifdef FD_SETSIZE - fd_set readfds; - fd_set mask; - #else - int readfds; -- register int mask; -+ int mask; - #endif /* def FD_SETSIZE */ - struct sockaddr_in from; - struct rpc_msg reply_msg; -@@ -416,7 +416,7 @@ clntudp_geterr( - CLIENT *cl, - struct rpc_err *errp) - { -- register struct cu_data *cu = (struct cu_data *)cl->cl_private; -+ struct cu_data *cu = (struct cu_data *)cl->cl_private; - - *errp = cu->cu_error; - } -@@ -428,8 +428,8 @@ clntudp_freeres( - xdrproc_t xdr_res, - void *res_ptr) - { -- register struct cu_data *cu = (struct cu_data *)cl->cl_private; -- register XDR *xdrs = &(cu->cu_outxdrs); -+ struct cu_data *cu = cl->cl_private; -+ XDR *xdrs = &cu->cu_outxdrs; - - xdrs->x_op = XDR_FREE; - return ((*xdr_res)(xdrs, res_ptr)); -@@ -448,7 +448,7 @@ clntudp_control( - int request, - void *info) - { -- register struct cu_data *cu = (struct cu_data *)cl->cl_private; -+ struct cu_data *cu = cl->cl_private; - - switch (request) { - case CLSET_TIMEOUT: -@@ -478,7 +478,7 @@ clntudp_control( - static void - clntudp_destroy(CLIENT *cl) - { -- register struct cu_data *cu = (struct cu_data *)cl->cl_private; -+ struct cu_data *cu = (struct cu_data *)cl->cl_private; - - if (cu->cu_closeit) - (void)closesocket(cu->cu_sock); -diff --git lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c -index db03daed6..ad6793f08 100644 ---- lib/rpc/getrpcent.c -+++ lib/rpc/getrpcent.c -@@ -66,7 +66,7 @@ static char RPCDB[] = "/etc/rpc"; - static struct rpcdata * - get_rpcdata(void) - { -- register struct rpcdata *d = rpcdata; -+ struct rpcdata *d = rpcdata; - - if (d == 0) { - d = (struct rpcdata *)calloc(1, sizeof (struct rpcdata)); -@@ -76,10 +76,10 @@ get_rpcdata(void) - } - - struct rpcent * --getrpcbynumber(register int number) -+getrpcbynumber(int number) - { -- register struct rpcdata *d = get_rpcdata(); -- register struct rpcent *p; -+ struct rpcdata *d = get_rpcdata(); -+ struct rpcent *p; - int reason; - char adrstr[16], *val = NULL; - int vallen; -@@ -116,7 +116,7 @@ getrpcbyname(const char *name) - - SETRPCENT_TYPE setrpcent(int f) - { -- register struct rpcdata *d = _rpcdata(); -+ struct rpcdata *d = _rpcdata(); - - if (d == 0) - return; -@@ -134,7 +134,7 @@ SETRPCENT_TYPE setrpcent(int f) - - ENDRPCENT_TYPE endrpcent(void) - { -- register struct rpcdata *d = _rpcdata(); -+ struct rpcdata *d = _rpcdata(); - - if (d == 0) - return; -@@ -155,7 +155,7 @@ getrpcent(void) - int reason; - char *key = NULL, *val = NULL; - int keylen, vallen; -- register struct rpcdata *d = _rpcdata(); -+ struct rpcdata *d = _rpcdata(); - - if (d == 0) - return(NULL); -@@ -172,9 +172,9 @@ getrpcent(void) - static struct rpcent * - interpret(char *val, int len) - { -- register struct rpcdata *d = _rpcdata(); -+ struct rpcdata *d = _rpcdata(); - char *p; -- register char *cp, **q; -+ char *cp, **q; - - if (d == 0) - return; -diff --git lib/rpc/pmap_clnt.c b/src/lib/rpc/pmap_clnt.c -index cda40fb29..952a25145 100644 ---- lib/rpc/pmap_clnt.c -+++ lib/rpc/pmap_clnt.c -@@ -69,7 +69,7 @@ pmap_set( - { - struct sockaddr_in myaddress; - int sock = -1; -- register CLIENT *client; -+ CLIENT *client; - struct pmap parms; - bool_t rslt; - -@@ -149,7 +149,7 @@ pmap_unset( - { - struct sockaddr_in myaddress; - int sock = -1; -- register CLIENT *client; -+ CLIENT *client; - struct pmap parms; - bool_t rslt; - -diff --git lib/rpc/pmap_getmaps.c b/src/lib/rpc/pmap_getmaps.c -index 7790a3af1..b8a9cecf7 100644 ---- lib/rpc/pmap_getmaps.c -+++ lib/rpc/pmap_getmaps.c -@@ -69,7 +69,7 @@ pmap_getmaps(struct sockaddr_in *address) - struct pmaplist *head = (struct pmaplist *)NULL; - int sock = -1; - struct timeval minutetimeout; -- register CLIENT *client; -+ CLIENT *client; - - minutetimeout.tv_sec = 60; - minutetimeout.tv_usec = 0; -diff --git lib/rpc/pmap_getport.c b/src/lib/rpc/pmap_getport.c -index 2fdb73ceb..66635a103 100644 ---- lib/rpc/pmap_getport.c -+++ lib/rpc/pmap_getport.c -@@ -68,7 +68,7 @@ pmap_getport( - { - unsigned short port = 0; - int sock = -1; -- register CLIENT *client; -+ CLIENT *client; - struct pmap parms; - - address->sin_port = htons(PMAPPORT); -diff --git lib/rpc/pmap_prot2.c b/src/lib/rpc/pmap_prot2.c -index 7fd7d3ef0..aeccac663 100644 ---- lib/rpc/pmap_prot2.c -+++ lib/rpc/pmap_prot2.c -@@ -84,7 +84,7 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro"; - * this sounds like a job for xdr_reference! - */ - bool_t --xdr_pmaplist(register XDR *xdrs, register struct pmaplist **rp) -+xdr_pmaplist(XDR *xdrs, struct pmaplist **rp) - { - /* - * more_elements is pre-computed in case the direction is -@@ -92,8 +92,8 @@ xdr_pmaplist(register XDR *xdrs, register struct pmaplist **rp) - * xdr_bool when the direction is XDR_DECODE. - */ - bool_t more_elements; -- register int freeing = (xdrs->x_op == XDR_FREE); -- register struct pmaplist **next = NULL; -+ int freeing = (xdrs->x_op == XDR_FREE); -+ struct pmaplist **next = NULL; - - while (TRUE) { - more_elements = (bool_t)(*rp != NULL); -diff --git lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c -index 4829e3ff0..8c7e30c21 100644 ---- lib/rpc/pmap_rmt.c -+++ lib/rpc/pmap_rmt.c -@@ -89,7 +89,7 @@ pmap_rmtcall( - rpcport_t *port_ptr) - { - SOCKET sock = INVALID_SOCKET; -- register CLIENT *client; -+ CLIENT *client; - struct rmtcallargs a; - struct rmtcallres r; - enum clnt_stat stat; -@@ -123,8 +123,8 @@ pmap_rmtcall( - */ - bool_t - xdr_rmtcall_args( -- register XDR *xdrs, -- register struct rmtcallargs *cap) -+ XDR *xdrs, -+ struct rmtcallargs *cap) - { - u_int lenposition, argposition, position; - -@@ -154,8 +154,8 @@ xdr_rmtcall_args( - */ - bool_t - xdr_rmtcallres( -- register XDR *xdrs, -- register struct rmtcallres *crp) -+ XDR *xdrs, -+ struct rmtcallres *crp) - { - caddr_t port_ptr; - -@@ -237,7 +237,7 @@ clnt_broadcast( - enum clnt_stat stat; - AUTH *unix_auth = authunix_create_default(); - XDR xdr_stream; -- register XDR *xdrs = &xdr_stream; -+ XDR *xdrs = &xdr_stream; - int outlen, nets; - ssize_t inlen; - GETSOCKNAME_ARG3_TYPE fromlen; -@@ -248,11 +248,11 @@ clnt_broadcast( - fd_set readfds; - #else - int readfds; -- register int mask; -+ int mask; - #endif /* def FD_SETSIZE */ -- register int i; -+ int i; - bool_t done = FALSE; -- register uint32_t xid; -+ uint32_t xid; - rpcport_t port; - struct in_addr addrs[20]; - struct sockaddr_in baddr, raddr; /* broadcast and response addresses */ -diff --git lib/rpc/rpc_callmsg.c b/src/lib/rpc/rpc_callmsg.c -index 6752524e5..27d298fa6 100644 ---- lib/rpc/rpc_callmsg.c -+++ lib/rpc/rpc_callmsg.c -@@ -47,10 +47,10 @@ static char sccsid[] = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro"; - * XDR a call message - */ - bool_t --xdr_callmsg(register XDR *xdrs, register struct rpc_msg *cmsg) -+xdr_callmsg(XDR *xdrs, struct rpc_msg *cmsg) - { -- register rpc_inline_t *buf; -- register struct opaque_auth *oa; -+ rpc_inline_t *buf; -+ struct opaque_auth *oa; - - if (xdrs->x_op == XDR_ENCODE) { - if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES) { -diff --git lib/rpc/svc.c b/src/lib/rpc/svc.c -index e923ac0be..c171ecc2a 100644 ---- lib/rpc/svc.c -+++ lib/rpc/svc.c -@@ -96,7 +96,7 @@ static void svc_do_xprt(SVCXPRT *xprt); - void - xprt_register(SVCXPRT *xprt) - { -- register int sock = xprt->xp_sock; -+ int sock = xprt->xp_sock; - - #ifdef FD_SETSIZE - if (gssrpc_svc_fdset_init == 0) { -@@ -130,7 +130,7 @@ xprt_register(SVCXPRT *xprt) - void - xprt_unregister(SVCXPRT *xprt) - { -- register int sock = xprt->xp_sock; -+ int sock = xprt->xp_sock; - - #ifdef FD_SETSIZE - if ((sock < FD_SETSIZE) && (xports[sock] == xprt)) { -@@ -166,7 +166,7 @@ svc_register( - int protocol) - { - struct svc_callout *prev; -- register struct svc_callout *s; -+ struct svc_callout *s; - - if ((s = svc_find(prog, vers, &prev)) != NULL_SVC) { - if (s->sc_dispatch == dispatch) -@@ -199,7 +199,7 @@ svc_unregister( - rpcvers_t vers) - { - struct svc_callout *prev; -- register struct svc_callout *s; -+ struct svc_callout *s; - - if ((s = svc_find(prog, vers, &prev)) == NULL_SVC) - return; -@@ -224,7 +224,7 @@ svc_find( - rpcvers_t vers, - struct svc_callout **prev) - { -- register struct svc_callout *s, *p; -+ struct svc_callout *s, *p; - - p = NULL_SVC; - for (s = svc_head; s != NULL_SVC; s = s->sc_next) { -@@ -244,7 +244,7 @@ done: - */ - bool_t - svc_sendreply( -- register SVCXPRT *xprt, -+ SVCXPRT *xprt, - xdrproc_t xdr_results, - caddr_t xdr_location) - { -@@ -263,7 +263,7 @@ svc_sendreply( - * No procedure error reply - */ - void --svcerr_noproc(register SVCXPRT *xprt) -+svcerr_noproc(SVCXPRT *xprt) - { - struct rpc_msg rply; - -@@ -278,7 +278,7 @@ svcerr_noproc(register SVCXPRT *xprt) - * Can't decode args error reply - */ - void --svcerr_decode(register SVCXPRT *xprt) -+svcerr_decode(SVCXPRT *xprt) - { - struct rpc_msg rply; - -@@ -293,7 +293,7 @@ svcerr_decode(register SVCXPRT *xprt) - * Some system error - */ - void --svcerr_systemerr(register SVCXPRT *xprt) -+svcerr_systemerr(SVCXPRT *xprt) - { - struct rpc_msg rply; - -@@ -335,7 +335,7 @@ svcerr_weakauth(SVCXPRT *xprt) - * Program unavailable error reply - */ - void --svcerr_noprog(register SVCXPRT *xprt) -+svcerr_noprog(SVCXPRT *xprt) - { - struct rpc_msg rply; - -@@ -351,7 +351,7 @@ svcerr_noprog(register SVCXPRT *xprt) - */ - void - svcerr_progvers( -- register SVCXPRT *xprt, -+ SVCXPRT *xprt, - rpcvers_t low_vers, - rpcvers_t high_vers) - { -@@ -417,8 +417,8 @@ svc_getreqset(FDSET_TYPE *readfds) - #ifndef FD_SETSIZE - int readfds_local = *readfds; - #endif -- register SVCXPRT *xprt; -- register int sock; -+ SVCXPRT *xprt; -+ int sock; - - #ifdef FD_SETSIZE - for (sock = 0; sock <= svc_maxfd; sock++) { -@@ -467,7 +467,7 @@ svc_do_xprt(SVCXPRT *xprt) - r.rq_clntcred = cookedcred; - - do { -- register struct svc_callout *s; -+ struct svc_callout *s; - enum auth_stat why; - - if (!SVC_RECV(xprt, &msg)) -diff --git lib/rpc/svc_auth.c b/src/lib/rpc/svc_auth.c -index 5fedef7d7..c1967bc9f 100644 ---- lib/rpc/svc_auth.c -+++ lib/rpc/svc_auth.c -@@ -47,8 +47,8 @@ - * - * enum auth_stat - * flavorx_auth(rqst, msg) -- * register struct svc_req *rqst; -- * register struct rpc_msg *msg; -+ * struct svc_req *rqst; -+ * struct rpc_msg *msg; - * - */ - -@@ -85,11 +85,11 @@ static int svcauthnum = sizeof(svcauthsw) / sizeof(struct svcauthsw_type); - */ - enum auth_stat - gssrpc__authenticate( -- register struct svc_req *rqst, -+ struct svc_req *rqst, - struct rpc_msg *msg, - bool_t *no_dispatch) - { -- register int cred_flavor, i; -+ int cred_flavor, i; - - rqst->rq_cred = msg->rm_call.cb_cred; - rqst->rq_xprt->xp_verf.oa_flavor = gssrpc__null_auth.oa_flavor; -diff --git lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c -index f3b3e35b8..182262e9b 100644 ---- lib/rpc/svc_auth_gssapi.c -+++ lib/rpc/svc_auth_gssapi.c -@@ -154,8 +154,8 @@ badauth(OM_uint32 maj, OM_uint32 minor, SVCXPRT *xprt) - } - - enum auth_stat gssrpc__svcauth_gssapi( -- register struct svc_req *rqst, -- register struct rpc_msg *msg, -+ struct svc_req *rqst, -+ struct rpc_msg *msg, - bool_t *no_dispatch) - { - XDR xdrs; -diff --git lib/rpc/svc_auth_unix.c b/src/lib/rpc/svc_auth_unix.c -index a4b87d8ff..ee3057ed9 100644 ---- lib/rpc/svc_auth_unix.c -+++ lib/rpc/svc_auth_unix.c -@@ -53,14 +53,14 @@ static char sccsid[] = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro"; - */ - enum auth_stat - gssrpc__svcauth_unix( -- register struct svc_req *rqst, -- register struct rpc_msg *msg, -+ struct svc_req *rqst, -+ struct rpc_msg *msg, - bool_t *dispatch) - { -- register enum auth_stat stat; -+ enum auth_stat stat; - XDR xdrs; -- register struct authunix_parms *aup; -- register rpc_inline_t *buf; -+ struct authunix_parms *aup; -+ rpc_inline_t *buf; - struct area { - struct authunix_parms area_aup; - char area_machname[MAX_MACHINE_NAME+1]; -diff --git lib/rpc/svc_raw.c b/src/lib/rpc/svc_raw.c -index ef5f3d3d7..dba6c29d5 100644 ---- lib/rpc/svc_raw.c -+++ lib/rpc/svc_raw.c -@@ -74,7 +74,7 @@ static struct xp_ops server_ops = { - SVCXPRT * - svcraw_create(void) - { -- register struct svcraw_private *srp = svcraw_private; -+ struct svcraw_private *srp = svcraw_private; - - if (srp == 0) { - srp = (struct svcraw_private *)calloc(1, sizeof (*srp)); -@@ -100,8 +100,8 @@ svcraw_stat(SVCXPRT *xprt) - static bool_t - svcraw_recv(SVCXPRT *xprt, struct rpc_msg *msg) - { -- register struct svcraw_private *srp = svcraw_private; -- register XDR *xdrs; -+ struct svcraw_private *srp = svcraw_private; -+ XDR *xdrs; - - if (srp == 0) - return (0); -@@ -116,8 +116,8 @@ svcraw_recv(SVCXPRT *xprt, struct rpc_msg *msg) - static bool_t - svcraw_reply(SVCXPRT *xprt, struct rpc_msg *msg) - { -- register struct svcraw_private *srp = svcraw_private; -- register XDR *xdrs; -+ struct svcraw_private *srp = svcraw_private; -+ XDR *xdrs; - - if (srp == 0) - return (FALSE); -@@ -133,7 +133,7 @@ svcraw_reply(SVCXPRT *xprt, struct rpc_msg *msg) - static bool_t - svcraw_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, void *args_ptr) - { -- register struct svcraw_private *srp = svcraw_private; -+ struct svcraw_private *srp = svcraw_private; - - if (srp == 0) - return (FALSE); -@@ -147,8 +147,8 @@ svcraw_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, void *args_ptr) - static bool_t - svcraw_freeargs(SVCXPRT *xprt, xdrproc_t xdr_args, void *args_ptr) - { -- register struct svcraw_private *srp = svcraw_private; -- register XDR *xdrs; -+ struct svcraw_private *srp = svcraw_private; -+ XDR *xdrs; - - if (srp == 0) - return (FALSE); -diff --git lib/rpc/svc_tcp.c b/src/lib/rpc/svc_tcp.c -index d78cf55a7..54ce70ed1 100644 ---- lib/rpc/svc_tcp.c -+++ lib/rpc/svc_tcp.c -@@ -141,8 +141,8 @@ svctcp_create( - u_int recvsize) - { - bool_t madesock = FALSE; -- register SVCXPRT *xprt; -- register struct tcp_rendezvous *r; -+ SVCXPRT *xprt; -+ struct tcp_rendezvous *r; - struct sockaddr_storage ss; - struct sockaddr *sa = (struct sockaddr *)&ss; - socklen_t len; -@@ -225,8 +225,8 @@ makefd_xprt( - u_int sendsize, - u_int recvsize) - { -- register SVCXPRT *xprt; -- register struct tcp_conn *cd; -+ SVCXPRT *xprt; -+ struct tcp_conn *cd; - - #ifdef FD_SETSIZE - if (fd >= FD_SETSIZE) { -@@ -272,7 +272,7 @@ makefd_xprt( - - static bool_t - rendezvous_request( -- register SVCXPRT *xprt, -+ SVCXPRT *xprt, - struct rpc_msg *msg) - { - SOCKET sock; -@@ -309,16 +309,16 @@ rendezvous_request( - } - - static enum xprt_stat --rendezvous_stat(register SVCXPRT *xprt) -+rendezvous_stat(SVCXPRT *xprt) - { - - return (XPRT_IDLE); - } - - static void --svctcp_destroy(register SVCXPRT *xprt) -+svctcp_destroy(SVCXPRT *xprt) - { -- register struct tcp_conn *cd = (struct tcp_conn *)xprt->xp_p1; -+ struct tcp_conn *cd = xprt->xp_p1; - - xprt_unregister(xprt); - (void)closesocket(xprt->xp_sock); -@@ -352,10 +352,10 @@ static int - readtcp( - char *xprtptr, - caddr_t buf, -- register int len) -+ int len) - { -- register SVCXPRT *xprt = (SVCXPRT *)(void *)xprtptr; -- register int sock = xprt->xp_sock; -+ SVCXPRT *xprt = (void *)xprtptr; -+ int sock = xprt->xp_sock; - struct timeval tout; - #ifdef FD_SETSIZE - fd_set mask; -@@ -364,7 +364,7 @@ readtcp( - FD_ZERO(&mask); - FD_SET(sock, &mask); - #else -- register int mask = 1 << sock; -+ int mask = 1 << sock; - int readfds; - #endif /* def FD_SETSIZE */ - #ifdef FD_SETSIZE -@@ -401,8 +401,8 @@ writetcp( - caddr_t buf, - int len) - { -- register SVCXPRT *xprt = (SVCXPRT *)(void *) xprtptr; -- register int i, cnt; -+ SVCXPRT *xprt = (void *)xprtptr; -+ int i, cnt; - - for (cnt = len; cnt > 0; cnt -= i, buf += i) { - if ((i = write(xprt->xp_sock, buf, (size_t) cnt)) < 0) { -@@ -417,8 +417,7 @@ writetcp( - static enum xprt_stat - svctcp_stat(SVCXPRT *xprt) - { -- register struct tcp_conn *cd = -- (struct tcp_conn *)(xprt->xp_p1); -+ struct tcp_conn *cd = xprt->xp_p1; - - if (cd->strm_stat == XPRT_DIED) - return (XPRT_DIED); -@@ -430,11 +429,10 @@ svctcp_stat(SVCXPRT *xprt) - static bool_t - svctcp_recv( - SVCXPRT *xprt, -- register struct rpc_msg *msg) -+ struct rpc_msg *msg) - { -- register struct tcp_conn *cd = -- (struct tcp_conn *)(xprt->xp_p1); -- register XDR *xdrs = &(cd->xdrs); -+ struct tcp_conn *cd = xprt->xp_p1; -+ XDR *xdrs = &cd->xdrs; - - xdrs->x_op = XDR_DECODE; - (void)xdrrec_skiprecord(xdrs); -@@ -466,8 +464,7 @@ svctcp_freeargs( - xdrproc_t xdr_args, - void * args_ptr) - { -- register XDR *xdrs = -- &(((struct tcp_conn *)(xprt->xp_p1))->xdrs); -+ XDR *xdrs = &((struct tcp_conn *)(xprt->xp_p1))->xdrs; - - xdrs->x_op = XDR_FREE; - return ((*xdr_args)(xdrs, args_ptr)); -@@ -475,12 +472,11 @@ svctcp_freeargs( - - static bool_t svctcp_reply( - SVCXPRT *xprt, -- register struct rpc_msg *msg) -+ struct rpc_msg *msg) - { -- register struct tcp_conn *cd = -- (struct tcp_conn *)(xprt->xp_p1); -- register XDR *xdrs = &(cd->xdrs); -- register bool_t stat; -+ struct tcp_conn *cd = xprt->xp_p1; -+ XDR *xdrs = &cd->xdrs; -+ bool_t stat; - - xdrproc_t xdr_results = NULL; - caddr_t xdr_location = 0; -diff --git lib/rpc/svc_udp.c b/src/lib/rpc/svc_udp.c -index f70bf0146..d3140df6b 100644 ---- lib/rpc/svc_udp.c -+++ lib/rpc/svc_udp.c -@@ -108,13 +108,13 @@ struct svcudp_data { - */ - SVCXPRT * - svcudp_bufcreate( -- register int sock, -+ int sock, - u_int sendsz, - u_int recvsz) - { - bool_t madesock = FALSE; -- register SVCXPRT *xprt; -- register struct svcudp_data *su; -+ SVCXPRT *xprt; -+ struct svcudp_data *su; - struct sockaddr_storage ss; - struct sockaddr *sa = (struct sockaddr *)&ss; - socklen_t len; -@@ -191,14 +191,14 @@ svcudp_stat(SVCXPRT *xprt) - - static bool_t - svcudp_recv( -- register SVCXPRT *xprt, -+ SVCXPRT *xprt, - struct rpc_msg *msg) - { - struct msghdr dummy; - struct iovec dummy_iov[1]; -- register struct svcudp_data *su = su_data(xprt); -- register XDR *xdrs = &(su->su_xdrs); -- register int rlen; -+ struct svcudp_data *su = su_data(xprt); -+ XDR *xdrs = &su->su_xdrs; -+ int rlen; - char *reply; - uint32_t replylen; - socklen_t addrlen; -@@ -243,13 +243,13 @@ svcudp_recv( - } - - static bool_t svcudp_reply( -- register SVCXPRT *xprt, -+ SVCXPRT *xprt, - struct rpc_msg *msg) - { -- register struct svcudp_data *su = su_data(xprt); -- register XDR *xdrs = &(su->su_xdrs); -- register int slen; -- register bool_t stat = FALSE; -+ struct svcudp_data *su = su_data(xprt); -+ XDR *xdrs = &su->su_xdrs; -+ int slen; -+ bool_t stat = FALSE; - - xdrproc_t xdr_results = NULL; - caddr_t xdr_location = 0; -@@ -305,16 +305,16 @@ svcudp_freeargs( - xdrproc_t xdr_args, - void * args_ptr) - { -- register XDR *xdrs = &(su_data(xprt)->su_xdrs); -+ XDR *xdrs = &su_data(xprt)->su_xdrs; - - xdrs->x_op = XDR_FREE; - return ((*xdr_args)(xdrs, args_ptr)); - } - - static void --svcudp_destroy(register SVCXPRT *xprt) -+svcudp_destroy(SVCXPRT *xprt) - { -- register struct svcudp_data *su = su_data(xprt); -+ struct svcudp_data *su = su_data(xprt); - - xprt_unregister(xprt); - if (xprt->xp_sock != INVALID_SOCKET) -@@ -446,9 +446,9 @@ cache_set( - SVCXPRT *xprt, - uint32_t replylen) - { -- register cache_ptr victim; -- register cache_ptr *vicp; -- register struct svcudp_data *su = su_data(xprt); -+ cache_ptr victim; -+ cache_ptr *vicp; -+ struct svcudp_data *su = su_data(xprt); - struct udp_cache *uc = (struct udp_cache *) su->su_cache; - u_int loc; - char *newbuf; -@@ -514,9 +514,9 @@ cache_get( - uint32_t *replylenp) - { - u_int loc; -- register cache_ptr ent; -- register struct svcudp_data *su = su_data(xprt); -- register struct udp_cache *uc = (struct udp_cache *) su->su_cache; -+ cache_ptr ent; -+ struct svcudp_data *su = su_data(xprt); -+ struct udp_cache *uc = su->su_cache; - - # define EQADDR(a1, a2) (memcmp((char*)&a1, (char*)&a2, sizeof(a1)) == 0) - -diff --git lib/rpc/unit-test/rpc_test_svc.c b/src/lib/rpc/unit-test/rpc_test_svc.c -index 88939f0a9..c54c0813d 100644 ---- lib/rpc/unit-test/rpc_test_svc.c -+++ lib/rpc/unit-test/rpc_test_svc.c -@@ -16,7 +16,7 @@ static int _rpcsvccount = 0; /* Number of requests being serviced */ - void - rpc_test_prog_1_svc(rqstp, transp) - struct svc_req *rqstp; -- register SVCXPRT *transp; -+ SVCXPRT *transp; - { - union { - char *rpc_test_echo_1_arg; -diff --git lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c -index 745155805..13e99bb06 100644 ---- lib/rpc/unit-test/server.c -+++ lib/rpc/unit-test/server.c -@@ -60,7 +60,7 @@ main(int argc, char **argv) - { - int c, prot; - auth_gssapi_name names[2]; -- register SVCXPRT *transp; -+ SVCXPRT *transp; - extern int optind; - #ifdef POSIX_SIGNALS - struct sigaction sa; -diff --git lib/rpc/xdr.c b/src/lib/rpc/xdr.c -index 2b7c17be3..8c14ddc68 100644 ---- lib/rpc/xdr.c -+++ lib/rpc/xdr.c -@@ -212,7 +212,7 @@ xdr_u_long(XDR *xdrs, u_long *ulp) - * XDR short integers - */ - bool_t --xdr_short(register XDR *xdrs, short *sp) -+xdr_short(XDR *xdrs, short *sp) - { - long l; - -@@ -243,7 +243,7 @@ xdr_short(register XDR *xdrs, short *sp) - * XDR unsigned short integers - */ - bool_t --xdr_u_short(register XDR *xdrs, u_short *usp) -+xdr_u_short(XDR *xdrs, u_short *usp) - { - u_long l; - -@@ -318,7 +318,7 @@ xdr_u_char(XDR *xdrs, u_char *cp) - * XDR booleans - */ - bool_t --xdr_bool(register XDR *xdrs, bool_t *bp) -+xdr_bool(XDR *xdrs, bool_t *bp) - { - long lb; - -@@ -384,7 +384,7 @@ xdr_enum(XDR *xdrs, enum_t *ep) - bool_t - xdr_opaque(XDR *xdrs, caddr_t cp, u_int cnt) - { -- register u_int rndup; -+ u_int rndup; - static int crud[BYTES_PER_XDR_UNIT]; - - /* -@@ -438,8 +438,8 @@ xdr_bytes( - u_int *sizep, - u_int maxsize) - { -- register char *sp = *cpp; /* sp is the actual string pointer */ -- register u_int nodesize; -+ char *sp = *cpp; /* sp is the actual string pointer */ -+ u_int nodesize; - - /* - * first deal with the length since xdr bytes are counted -@@ -563,7 +563,7 @@ xdr_union( - xdrproc_t dfault /* default xdr routine */ - ) - { -- register enum_t dscm; -+ enum_t dscm; - - /* - * we deal with the discriminator; it's an enum -@@ -607,7 +607,7 @@ xdr_union( - bool_t - xdr_string(XDR *xdrs, char **cpp, u_int maxsize) - { -- register char *sp = *cpp; /* sp is the actual string pointer */ -+ char *sp = *cpp; /* sp is the actual string pointer */ - u_int size; - u_int nodesize; - -diff --git lib/rpc/xdr_alloc.c b/src/lib/rpc/xdr_alloc.c -index 8c58cffca..f39210e15 100644 ---- lib/rpc/xdr_alloc.c -+++ lib/rpc/xdr_alloc.c -@@ -86,14 +86,14 @@ static void xdralloc_destroy(XDR *xdrs) - } - - static bool_t xdralloc_notsup_getlong( -- register XDR *xdrs, -+ XDR *xdrs, - long *lp) - { - return FALSE; - } - - static bool_t xdralloc_putlong( -- register XDR *xdrs, -+ XDR *xdrs, - long *lp) - { - int l = htonl((uint32_t) *lp); /* XXX need bounds checking */ -@@ -108,18 +108,18 @@ static bool_t xdralloc_putlong( - - - static bool_t xdralloc_notsup_getbytes( -- register XDR *xdrs, -+ XDR *xdrs, - caddr_t addr, -- register unsigned int len) -+ unsigned int len) - { - return FALSE; - } - - - static bool_t xdralloc_putbytes( -- register XDR *xdrs, -+ XDR *xdrs, - caddr_t addr, -- register unsigned int len) -+ unsigned int len) - { - if (DynInsert((DynObject) xdrs->x_private, - DynSize((DynObject) xdrs->x_private), -@@ -134,7 +134,7 @@ static unsigned int xdralloc_getpos(XDR *xdrs) - } - - static bool_t xdralloc_notsup_setpos( -- register XDR *xdrs, -+ XDR *xdrs, - unsigned int lp) - { - return FALSE; -@@ -143,7 +143,7 @@ static bool_t xdralloc_notsup_setpos( - - - static rpc_inline_t *xdralloc_inline( -- register XDR *xdrs, -+ XDR *xdrs, - int len) - { - return (rpc_inline_t *) 0; -diff --git lib/rpc/xdr_array.c b/src/lib/rpc/xdr_array.c -index c3d16fb53..aeaa7f2bb 100644 ---- lib/rpc/xdr_array.c -+++ lib/rpc/xdr_array.c -@@ -59,7 +59,7 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro"; - */ - bool_t - xdr_array( -- register XDR *xdrs, -+ XDR *xdrs, - caddr_t *addrp, /* array pointer */ - u_int *sizep, /* number of elements */ - u_int maxsize, /* max numberof elements */ -@@ -67,11 +67,11 @@ xdr_array( - xdrproc_t elproc /* xdr routine to handle each element */ - ) - { -- register u_int i; -- register caddr_t target = *addrp; -- register u_int c; /* the actual element count */ -- register bool_t stat = TRUE; -- register u_int nodesize; -+ u_int i; -+ caddr_t target = *addrp; -+ u_int c; /* the actual element count */ -+ bool_t stat = TRUE; -+ u_int nodesize; - - /* like strings, arrays are really counted arrays */ - if (! xdr_u_int(xdrs, sizep)) { -@@ -139,14 +139,14 @@ xdr_array( - */ - bool_t - xdr_vector( -- register XDR *xdrs, -- register char *basep, -- register u_int nelem, -- register u_int elemsize, -- register xdrproc_t xdr_elem) -+ XDR *xdrs, -+ char *basep, -+ u_int nelem, -+ u_int elemsize, -+ xdrproc_t xdr_elem) - { -- register u_int i; -- register char *elptr; -+ u_int i; -+ char *elptr; - - elptr = basep; - for (i = 0; i < nelem; i++) { -diff --git lib/rpc/xdr_float.c b/src/lib/rpc/xdr_float.c -index 5b6e9cafb..82059b7ce 100644 ---- lib/rpc/xdr_float.c -+++ lib/rpc/xdr_float.c -@@ -198,11 +198,11 @@ static struct dbl_limits { - bool_t - xdr_double(XDR *xdrs, double *dp) - { -- register int32_t *lp; -+ int32_t *lp; - #if defined(vax) - struct ieee_double id; - struct vax_double vd; -- register struct dbl_limits *lim; -+ struct dbl_limits *lim; - int i; - #endif - -diff --git lib/rpc/xdr_mem.c b/src/lib/rpc/xdr_mem.c -index f3eb047b1..8d3f12017 100644 ---- lib/rpc/xdr_mem.c -+++ lib/rpc/xdr_mem.c -@@ -160,8 +160,8 @@ xdrmem_getpos(XDR *xdrs) - static bool_t - xdrmem_setpos(XDR *xdrs, u_int pos) - { -- register caddr_t newaddr = xdrs->x_base + pos; -- register caddr_t lastaddr = (char *) xdrs->x_private + xdrs->x_handy; -+ caddr_t newaddr = xdrs->x_base + pos; -+ caddr_t lastaddr = (char *)xdrs->x_private + xdrs->x_handy; - - if ((long)newaddr > (long)lastaddr) - return (FALSE); -diff --git lib/rpc/xdr_rec.c b/src/lib/rpc/xdr_rec.c -index 058788257..28894f38b 100644 ---- lib/rpc/xdr_rec.c -+++ lib/rpc/xdr_rec.c -@@ -144,8 +144,7 @@ xdrrec_create( - int (*writeit)() /* like write, but pass it a tcp_handle, not sock */ - ) - { -- register RECSTREAM *rstrm = -- (RECSTREAM *)mem_alloc(sizeof(RECSTREAM)); -+ RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM)); - - if (rstrm == NULL) { - (void)fprintf(stderr, "xdrrec_create: out of memory\n"); -@@ -199,8 +198,8 @@ xdrrec_create( - static bool_t - xdrrec_getlong(XDR *xdrs, long *lp) - { -- register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); -- register int32_t *buflp = (int32_t *)(void *)(rstrm->in_finger); -+ RECSTREAM *rstrm = xdrs->x_private; -+ int32_t *buflp = (void *)(rstrm->in_finger); - uint32_t mylong; - - /* first try the inline, fast case */ -@@ -222,8 +221,8 @@ xdrrec_getlong(XDR *xdrs, long *lp) - static bool_t - xdrrec_putlong(XDR *xdrs, long *lp) - { -- register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); -- register int32_t *dest_lp = ((int32_t *)(void *)(rstrm->out_finger)); -+ RECSTREAM *rstrm = xdrs->x_private; -+ int32_t *dest_lp = (void *)(rstrm->out_finger); - - if (rstrm->out_boundry - rstrm->out_finger < BYTES_PER_XDR_UNIT) { - /* -@@ -243,8 +242,8 @@ xdrrec_putlong(XDR *xdrs, long *lp) - static bool_t /* must manage buffers, fragments, and records */ - xdrrec_getbytes(XDR *xdrs, caddr_t addr, u_int len) - { -- register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); -- register u_int current; -+ RECSTREAM *rstrm = xdrs->x_private; -+ u_int current; - - while (len > 0) { - current = rstrm->fbtbc; -@@ -268,8 +267,8 @@ xdrrec_getbytes(XDR *xdrs, caddr_t addr, u_int len) - static bool_t - xdrrec_putbytes(XDR *xdrs, caddr_t addr, u_int len) - { -- register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); -- register size_t current; -+ RECSTREAM *rstrm = xdrs->x_private; -+ size_t current; - - while (len > 0) { - current = (size_t) ((long)rstrm->out_boundry - -@@ -291,8 +290,8 @@ xdrrec_putbytes(XDR *xdrs, caddr_t addr, u_int len) - static u_int - xdrrec_getpos(XDR *xdrs) - { -- register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; -- register int pos; -+ RECSTREAM *rstrm = xdrs->x_private; -+ int pos; - - switch (xdrs->x_op) { - -@@ -316,7 +315,7 @@ xdrrec_getpos(XDR *xdrs) - static bool_t - xdrrec_setpos(XDR *xdrs, u_int pos) - { -- register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; -+ RECSTREAM *rstrm = xdrs->x_private; - u_int currpos = xdrrec_getpos(xdrs); - int delta = currpos - pos; - caddr_t newpos; -@@ -353,7 +352,7 @@ xdrrec_setpos(XDR *xdrs, u_int pos) - static rpc_inline_t * - xdrrec_inline(XDR *xdrs, int len) - { -- register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; -+ RECSTREAM *rstrm = xdrs->x_private; - rpc_inline_t * buf = NULL; - - if (len < 0) -@@ -386,7 +385,7 @@ xdrrec_inline(XDR *xdrs, int len) - static void - xdrrec_destroy(XDR *xdrs) - { -- register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; -+ RECSTREAM *rstrm = xdrs->x_private; - - mem_free(rstrm->the_buffer, - rstrm->sendsize + rstrm->recvsize + BYTES_PER_XDR_UNIT); -@@ -405,7 +404,7 @@ xdrrec_destroy(XDR *xdrs) - bool_t - xdrrec_skiprecord(XDR *xdrs) - { -- register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); -+ RECSTREAM *rstrm = xdrs->x_private; - - while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) { - if (! skip_input_bytes(rstrm, rstrm->fbtbc)) -@@ -426,7 +425,7 @@ xdrrec_skiprecord(XDR *xdrs) - bool_t - xdrrec_eof(XDR *xdrs) - { -- register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); -+ RECSTREAM *rstrm = xdrs->x_private; - - while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) { - if (! skip_input_bytes(rstrm, rstrm->fbtbc)) -@@ -449,8 +448,8 @@ xdrrec_eof(XDR *xdrs) - bool_t - xdrrec_endofrecord(XDR *xdrs, bool_t sendnow) - { -- register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); -- register uint32_t len; /* fragment length */ -+ RECSTREAM *rstrm = xdrs->x_private; -+ uint32_t len; /* fragment length */ - - if (sendnow || rstrm->frag_sent || - ((long)rstrm->out_finger + BYTES_PER_XDR_UNIT >= -@@ -473,8 +472,8 @@ xdrrec_endofrecord(XDR *xdrs, bool_t sendnow) - static bool_t - flush_out(RECSTREAM *rstrm, bool_t eor) - { -- register uint32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; -- register uint32_t len = (u_long)(rstrm->out_finger) - -+ uint32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; -+ uint32_t len = (u_long)(rstrm->out_finger) - - (u_long)(rstrm->frag_header) - BYTES_PER_XDR_UNIT; - - *(rstrm->frag_header) = htonl(len | eormask); -@@ -490,9 +489,9 @@ flush_out(RECSTREAM *rstrm, bool_t eor) - static bool_t /* knows nothing about records! Only about input buffers */ - fill_input_buf(RECSTREAM *rstrm) - { -- register caddr_t where; -+ caddr_t where; - u_int i; -- register int len; -+ int len; - - where = rstrm->in_base; - i = (u_int)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT); -@@ -509,7 +508,7 @@ fill_input_buf(RECSTREAM *rstrm) - static bool_t /* knows nothing about records! Only about input buffers */ - get_input_bytes(RECSTREAM *rstrm, caddr_t addr, int len) - { -- register size_t current; -+ size_t current; - - while (len > 0) { - current = (size_t)((long)rstrm->in_boundry - -@@ -530,7 +529,7 @@ get_input_bytes(RECSTREAM *rstrm, caddr_t addr, int len) - - static bool_t /* next four bytes of input stream are treated as a header */ - set_input_fragment(rstrm) -- register RECSTREAM *rstrm; -+ RECSTREAM *rstrm; - { - uint32_t header; - -@@ -545,7 +544,7 @@ set_input_fragment(rstrm) - static bool_t /* consumes input bytes; knows nothing about records! */ - skip_input_bytes(RECSTREAM *rstrm, int32_t cnt) - { -- register int current; -+ int current; - - while (cnt > 0) { - current = (int)((long)rstrm->in_boundry - -diff --git lib/rpc/xdr_reference.c b/src/lib/rpc/xdr_reference.c -index eca4648ec..eab7d2d5f 100644 ---- lib/rpc/xdr_reference.c -+++ lib/rpc/xdr_reference.c -@@ -66,8 +66,8 @@ xdr_reference( - xdrproc_t proc /* xdr routine to handle the object */ - ) - { -- register caddr_t loc = *pp; -- register bool_t stat; -+ caddr_t loc = *pp; -+ bool_t stat; - - if (loc == NULL) - switch (xdrs->x_op) { -diff --git plugins/kdb/db2/libdb2/btree/bt_utils.c b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c -index 1a34598ad..be2f24f21 100644 ---- plugins/kdb/db2/libdb2/btree/bt_utils.c -+++ plugins/kdb/db2/libdb2/btree/bt_utils.c -@@ -216,8 +216,8 @@ int - __bt_defcmp(a, b) - const DBT *a, *b; - { -- register size_t len; -- register u_char *p1, *p2; -+ size_t len; -+ u_char *p1, *p2; - - /* - * XXX -@@ -246,8 +246,8 @@ size_t - __bt_defpfx(a, b) - const DBT *a, *b; - { -- register u_char *p1, *p2; -- register size_t cnt, len; -+ u_char *p1, *p2; -+ size_t cnt, len; - - cnt = 1; - len = MIN(a->size, b->size); -diff --git plugins/kdb/db2/libdb2/recno/rec_search.c b/src/plugins/kdb/db2/libdb2/recno/rec_search.c -index 15042627d..244d79f36 100644 ---- plugins/kdb/db2/libdb2/recno/rec_search.c -+++ plugins/kdb/db2/libdb2/recno/rec_search.c -@@ -66,8 +66,8 @@ __rec_search(t, recno, op) - recno_t recno; - enum SRCHOP op; - { -- register indx_t idx; -- register PAGE *h; -+ indx_t idx; -+ PAGE *h; - EPGNO *parent; - RINTERNAL *r; - db_pgno_t pg; -diff --git plugins/kdb/db2/libdb2/test/btree.tests/main.c b/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c -index 8281d0e77..088f90323 100644 ---- plugins/kdb/db2/libdb2/test/btree.tests/main.c -+++ plugins/kdb/db2/libdb2/test/btree.tests/main.c -@@ -710,7 +710,7 @@ load(db, argv) - DB *db; - char **argv; - { -- register char *p, *t; -+ char *p, *t; - FILE *fp; - DBT data, key; - recno_t cnt; -diff --git plugins/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c -index ddb1ab246..5d76b1ddf 100644 ---- plugins/kdb/db2/libdb2/test/dbtest.c -+++ plugins/kdb/db2/libdb2/test/dbtest.c -@@ -383,8 +383,8 @@ void - compare(db1, db2) - DBT *db1, *db2; - { -- register size_t len; -- register u_char *p1, *p2; -+ size_t len; -+ u_char *p1, *p2; - - if (db1->size != db2->size) { - printf("compare failed: key->data len %lu != data len %lu\n", -diff --git util/profile/profile_tcl.c b/src/util/profile/profile_tcl.c -index 4f7a86a57..eb9950a10 100644 ---- util/profile/profile_tcl.c -+++ util/profile/profile_tcl.c -@@ -544,14 +544,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start, - swig_module_info *iter = start; - do { - if (iter->size) { -- register size_t l = 0; -- register size_t r = iter->size - 1; -+ size_t l = 0; -+ size_t r = iter->size - 1; - do { - /* since l+r >= 0, we can (>> 1) instead (/ 2) */ -- register size_t i = (l + r) >> 1; -+ size_t i = (l + r) >> 1; - const char *iname = iter->types[i]->name; - if (iname) { -- register int compare = strcmp(name, iname); -+ int compare = strcmp(name, iname); - if (compare == 0) { - return iter->types[i]; - } else if (compare < 0) { -@@ -595,7 +595,7 @@ SWIG_TypeQueryModule(swig_module_info *start, - of the str field (the human readable name) */ - swig_module_info *iter = start; - do { -- register size_t i = 0; -+ size_t i = 0; - for (; i < iter->size; ++i) { - if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) - return iter->types[i]; -@@ -614,10 +614,10 @@ SWIG_TypeQueryModule(swig_module_info *start, - SWIGRUNTIME char * - SWIG_PackData(char *c, void *ptr, size_t sz) { - static const char hex[17] = "0123456789abcdef"; -- register const unsigned char *u = (unsigned char *) ptr; -- register const unsigned char *eu = u + sz; -+ const unsigned char *u = (unsigned char *) ptr; -+ const unsigned char *eu = u + sz; - for (; u != eu; ++u) { -- register unsigned char uu = *u; -+ unsigned char uu = *u; - *(c++) = hex[(uu & 0xf0) >> 4]; - *(c++) = hex[uu & 0xf]; - } -@@ -629,11 +629,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) { - */ - SWIGRUNTIME const char * - SWIG_UnpackData(const char *c, void *ptr, size_t sz) { -- register unsigned char *u = (unsigned char *) ptr; -- register const unsigned char *eu = u + sz; -+ unsigned char *u = (unsigned char *) ptr; -+ const unsigned char *eu = u + sz; - for (; u != eu; ++u) { -- register char d = *(c++); -- register unsigned char uu; -+ char d = *(c++); -+ unsigned char uu; - if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); - else if ((d >= 'a') && (d <= 'f')) -diff --git util/ss/cmd_tbl.lex.l b/src/util/ss/cmd_tbl.lex.l -index b47085e98..af0132842 100644 ---- util/ss/cmd_tbl.lex.l -+++ util/ss/cmd_tbl.lex.l -@@ -65,7 +65,7 @@ static l_end() - - static l_quoted_string() - { -- register char *p; -+ char *p; - yylval.dynstr = strdup(yytext+1); - if (p=strrchr(yylval.dynstr, '"')) - *p='\0'; -diff --git util/ss/error.c b/src/util/ss/error.c -index 6d5f69a7b..b5768a62b 100644 ---- util/ss/error.c -+++ util/ss/error.c -@@ -36,7 +36,7 @@ - char * ss_name(sci_idx) - int sci_idx; - { -- register ss_data *infop; -+ ss_data *infop; - - infop = ss_info(sci_idx); - if (infop->current_request == (char const *)NULL) { -@@ -52,7 +52,7 @@ char * ss_name(sci_idx) - - void ss_error (int sci_idx, long code, const char * fmt, ...) - { -- register char *whoami; -+ char *whoami; - va_list pvar; - va_start (pvar, fmt); - whoami = ss_name (sci_idx); -diff --git util/ss/execute_cmd.c b/src/util/ss/execute_cmd.c -index 6c3855c28..cbd697d5c 100644 ---- util/ss/execute_cmd.c -+++ util/ss/execute_cmd.c -@@ -53,14 +53,14 @@ - */ - - static int check_request_table (rqtbl, argc, argv, sci_idx) -- register ss_request_table *rqtbl; -+ ss_request_table *rqtbl; - int argc; - char *argv[]; - int sci_idx; - { -- register ss_request_entry *request; -- register ss_data *info; -- register char const * const * name; -+ ss_request_entry *request; -+ ss_data *info; -+ char const *const *name; - char *string = argv[0]; - int i; - -@@ -106,8 +106,8 @@ static int really_execute_command (sci_idx, argc, argv) - int argc; - char **argv[]; - { -- register ss_request_table **rqtbl; -- register ss_data *info; -+ ss_request_table **rqtbl; -+ ss_data *info; - - info = ss_info(sci_idx); - -@@ -137,9 +137,9 @@ static int really_execute_command (sci_idx, argc, argv) - int - ss_execute_command(sci_idx, argv) - int sci_idx; -- register char *argv[]; -+ char *argv[]; - { -- register unsigned int i, argc; -+ unsigned int i, argc; - char **argp; - int ret; - -diff --git util/ss/help.c b/src/util/ss/help.c -index 4463ad45f..6d333c971 100644 ---- util/ss/help.c -+++ util/ss/help.c -@@ -25,8 +25,8 @@ void ss_help (argc, argv, sci_idx, info_ptr) - char const *request_name; - int code; - int fd, child; -- register int idx; -- register ss_data *info; -+ int idx; -+ ss_data *info; - - request_name = ss_current_request(sci_idx, &code); - if (code != 0) { -@@ -102,10 +102,10 @@ got_it: - char *info_dir; - int *code_ptr; - { -- register ss_data *info; -+ ss_data *info; - DIR *d; - int n_dirs; -- register char **dirs; -+ char **dirs; - - info = ss_info(sci_idx); - if ((info_dir == NULL) || (*info_dir == '\0')) { -@@ -138,8 +138,8 @@ got_it: - char *info_dir; - int *code_ptr; - { -- register char **i_d; -- register char **info_dirs; -+ char **i_d; -+ char **info_dirs; - - info_dirs = ss_info(sci_idx)->info_dirs; - for (i_d = info_dirs; *i_d; i_d++) { -diff --git util/ss/invocation.c b/src/util/ss/invocation.c -index d9c4ea5fa..378bc3e92 100644 ---- util/ss/invocation.c -+++ util/ss/invocation.c -@@ -43,9 +43,9 @@ int ss_create_invocation(subsystem_name, version_string, info_ptr, - ss_request_table *request_table_ptr; - int *code_ptr; - { -- register int sci_idx; -- register ss_data *new_table; -- register ss_data **table, **tmp; -+ int sci_idx; -+ ss_data *new_table; -+ ss_data **table, **tmp; - - *code_ptr = 0; - table = _ss_table; -@@ -118,7 +118,7 @@ void - ss_delete_invocation(sci_idx) - int sci_idx; - { -- register ss_data *t; -+ ss_data *t; - int ignored_code; - - t = ss_info(sci_idx); -diff --git util/ss/list_rqs.c b/src/util/ss/list_rqs.c -index d5b3c877b..fe5f14911 100644 ---- util/ss/list_rqs.c -+++ util/ss/list_rqs.c -@@ -31,10 +31,10 @@ ss_list_requests(argc, argv, sci_idx, info_ptr) - char *info_ptr; - #endif - { -- register ss_request_entry *entry; -- register char const * const *name; -- register int spacing; -- register ss_request_table **table; -+ ss_request_entry *entry; -+ char const *const *name; -+ int spacing; -+ ss_request_table **table; - - char buffer[BUFSIZ]; - FILE *output; -@@ -90,7 +90,7 @@ ss_list_requests(argc, argv, sci_idx, info_ptr) - continue; - buffer[sizeof(buffer) - 1] = '\0'; - for (name = entry->command_names; *name; name++) { -- register int len = strlen(*name); -+ int len = strlen(*name); - strncat(buffer, *name, sizeof(buffer) - 1 - strlen(buffer)); - spacing += len + 2; - if (name[1]) { -diff --git util/ss/listen.c b/src/util/ss/listen.c -index 75b904490..c99caa34b 100644 ---- util/ss/listen.c -+++ util/ss/listen.c -@@ -61,8 +61,8 @@ static RETSIGTYPE listen_int_handler(signo) - int ss_listen (sci_idx) - int sci_idx; - { -- register char *cp; -- register ss_data *info; -+ char *cp; -+ ss_data *info; - char *input; - int code; - jmp_buf old_jmpb; -@@ -71,7 +71,7 @@ int ss_listen (sci_idx) - struct sigaction isig, csig, nsig, osig; - sigset_t nmask, omask; - #else -- register RETSIGTYPE (*sig_cont)(); -+ RETSIGTYPE (*sig_cont)(); - RETSIGTYPE (*sig_int)(), (*old_sig_cont)(); - int mask; - #endif -@@ -136,7 +136,7 @@ int ss_listen (sci_idx) - - code = ss_execute_line (sci_idx, input); - if (code == SS_ET_COMMAND_NOT_FOUND) { -- register char *c = input; -+ char *c = input; - while (*c == ' ' || *c == '\t') - c++; - cp = strchr (c, ' '); -diff --git util/ss/options.c b/src/util/ss/options.c -index c3452f9e1..807f8e670 100644 ---- util/ss/options.c -+++ util/ss/options.c -@@ -23,9 +23,9 @@ static struct option options[] = { - - long - flag_val(string) -- register char *string; -+ char *string; - { -- register struct option *opt; -+ struct option *opt; - for (opt = options; opt->text; opt++) - if (!strcmp(opt->text, string)) - return(opt->value); -diff --git util/ss/pager.c b/src/util/ss/pager.c -index ae023b594..3e47ed399 100644 ---- util/ss/pager.c -+++ util/ss/pager.c -@@ -102,7 +102,7 @@ void ss_page_stdin() - { - /* minimal recovery if pager program isn't found */ - char buf[80]; -- register int n; -+ int n; - while ((n = read(0, buf, 80)) > 0) - write(1, buf, (unsigned) n); - } -diff --git util/ss/parse.c b/src/util/ss/parse.c -index 456b14743..78a831bf3 100644 ---- util/ss/parse.c -+++ util/ss/parse.c -@@ -55,13 +55,13 @@ enum parse_mode { WHITESPACE, TOKEN, QUOTED_STRING }; - - char **ss_parse (sci_idx, line_ptr, argc_ptr) - int sci_idx; -- register char *line_ptr; -+ char *line_ptr; - int *argc_ptr; - { -- register char **argv, *cp; -+ char **argv, *cp; - char **newargv; -- register int argc; -- register enum parse_mode parse_mode; -+ int argc; -+ enum parse_mode parse_mode; - - argv = (char **) malloc (sizeof(char *)); - if (argv == (char **)NULL) { -diff --git util/ss/request_tbl.c b/src/util/ss/request_tbl.c -index 7721a5f23..03cde1b7d 100644 ---- util/ss/request_tbl.c -+++ util/ss/request_tbl.c -@@ -17,8 +17,8 @@ ss_add_request_table(sci_idx, rqtbl_ptr, position, code_ptr) - int position; /* 1 -> becomes second... */ - int *code_ptr; - { -- register ss_data *info; -- register int i, size; -+ ss_data *info; -+ int i, size; - - info = ss_info(sci_idx); - for (size=0; info->rqt_tables[size] != (ssrt *)NULL; size++) -@@ -49,8 +49,8 @@ ss_delete_request_table(sci_idx, rqtbl_ptr, code_ptr) - ssrt *rqtbl_ptr; - int *code_ptr; - { -- register ss_data *info; -- register ssrt **rt1, **rt2; -+ ss_data *info; -+ ssrt **rt1, **rt2; - - *code_ptr = SS_ET_TABLE_NOT_FOUND; - info = ss_info(sci_idx); -diff --git util/ss/requests.c b/src/util/ss/requests.c -index 3e62f970c..aa6752fa1 100644 ---- util/ss/requests.c -+++ util/ss/requests.c -@@ -16,7 +16,7 @@ - */ - DECLARE(ss_self_identify) - { -- register ss_data *info = ss_info(sci_idx); -+ ss_data *info = ss_info(sci_idx); - printf("%s version %s\n", info->subsystem_name, - info->subsystem_version); - } -diff --git util/ss/utils.c b/src/util/ss/utils.c -index 3b1f6582a..675de7cb1 100644 ---- util/ss/utils.c -+++ util/ss/utils.c -@@ -78,7 +78,7 @@ gensym(name) - - /* concatenate three strings and return the result */ - char *str_concat3(a, b, c) -- register char *a, *b, *c; -+ char *a, *b, *c; - { - char *result; - -@@ -88,9 +88,9 @@ char *str_concat3(a, b, c) - - /* return copy of string enclosed in double-quotes */ - char *quote(string) -- register char *string; -+ char *string; - { -- register char *result; -+ char *result; - - asprintf(&result, "\"%s\"", string); - return(result); -@@ -99,10 +99,10 @@ char *quote(string) - #ifndef HAVE_STRDUP - /* make duplicate of string and return pointer */ - char *strdup(s) -- register char *s; -+ char *s; - { -- register int len = strlen(s) + 1; -- register char *new; -+ int len = strlen(s) + 1; -+ char *new; - new = malloc(len); - strncpy(new, s, len); - return(new); -diff --git util/support/mkstemp.c b/src/util/support/mkstemp.c -index 9ef586a09..285757f2a 100644 ---- util/support/mkstemp.c -+++ util/support/mkstemp.c -@@ -75,9 +75,9 @@ int mkstemp(path) - static int - _gettemp(path, doopen) - char *path; -- register int *doopen; -+ int *doopen; - { -- register char *start, *trv; -+ char *start, *trv; - struct stat sbuf; - u_int pid; - -diff --git windows/leashdll/timesync.c b/src/windows/leashdll/timesync.c -index 15b6d7df8..b6b448123 100644 ---- windows/leashdll/timesync.c -+++ windows/leashdll/timesync.c -@@ -216,8 +216,8 @@ int ProcessTimeSync(char *hostname, int Port, char *tmpstr) - { - char buffer[512]; - int cc; -- register long *nettime; -- register int s; -+ long *nettime; -+ int s; - long hosttime; - struct hostent *host; - struct timeval tv; diff --git a/security/krb5-114/files/patch-clients__ksu__Makefile.in b/security/krb5-114/files/patch-clients__ksu__Makefile.in deleted file mode 100644 index 7ec54abdc076..000000000000 --- a/security/krb5-114/files/patch-clients__ksu__Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- clients/ksu/Makefile.in.orig 2014-01-15 16:44:15.000000000 -0800 -+++ clients/ksu/Makefile.in 2014-05-05 20:51:51.925985974 -0700 -@@ -1,6 +1,6 @@ - mydir=clients$(S)ksu - BUILDTOP=$(REL)..$(S).. --DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' -+DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG - - KSU_LIBS=@KSU_LIBS@ - -@@ -30,6 +30,6 @@ - - install:: - -for f in ksu; do \ -- $(INSTALL_SETUID) $$f \ -+ $(INSTALL_PROGRAM) $$f \ - $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ - done diff --git a/security/krb5-114/files/patch-config__pre.in b/security/krb5-114/files/patch-config__pre.in deleted file mode 100644 index 228547a1d886..000000000000 --- a/security/krb5-114/files/patch-config__pre.in +++ /dev/null @@ -1,27 +0,0 @@ ---- config/pre.in.orig 2017-09-25 09:29:00.000000000 -0700 -+++ config/pre.in 2018-07-01 20:51:31.308815000 -0700 -@@ -178,9 +178,9 @@ - INSTALL=@INSTALL@ - INSTALL_STRIP= - INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) --INSTALL_SCRIPT=@INSTALL_PROGRAM@ -+INSTALL_SCRIPT=@INSTALL_SCRIPT@ - INSTALL_DATA=@INSTALL_DATA@ --INSTALL_SHLIB=@INSTALL_SHLIB@ -+INSTALL_SHLIB=$(INSTALL_LIB) - INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root - ## This is needed because autoconf will sometimes define @exec_prefix@ to be - ## ${prefix}. -@@ -197,10 +197,11 @@ - ADMIN_BINDIR = @sbindir@ - SERVER_BINDIR = @sbindir@ - CLIENT_BINDIR =@bindir@ --PKGCONFIG_DIR = @libdir@/pkgconfig -+PKGCONFIG_DIR = $(prefix)/libdata/pkgconfig - ADMIN_MANDIR = $(KRB5MANROOT)/man8 - SERVER_MANDIR = $(KRB5MANROOT)/man8 - CLIENT_MANDIR = $(KRB5MANROOT)/man1 -+SUBR_MANDIR = $(KRB5MANROOT)/man3 - FILE_MANDIR = $(KRB5MANROOT)/man5 - ADMIN_CATDIR = $(KRB5MANROOT)/cat8 - SERVER_CATDIR = $(KRB5MANROOT)/cat8 diff --git a/security/krb5-114/files/patch-config__shlib.conf b/security/krb5-114/files/patch-config__shlib.conf deleted file mode 100644 index 3697783e47be..000000000000 --- a/security/krb5-114/files/patch-config__shlib.conf +++ /dev/null @@ -1,22 +0,0 @@ ---- config/shlib.conf.orig 2015-05-08 16:27:02.000000000 -0700 -+++ config/shlib.conf 2015-10-20 21:54:39.834348929 -0700 -@@ -320,14 +320,15 @@ - PICFLAGS=-fpic - ;; - esac -- SHLIBVEXT='.so.$(LIBMAJOR)' -- RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,' -+ SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' -+ SHLIBSEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE='libtool --tag=CC --mode=link cc -Xcompiler -shared -Wl,-soname=$(LIBPREFIX)$(LIBBASE)$(SHLIBVEXT)' -+ RPATH_FLAG='-Wl,-rpath -Wl,' - PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' - CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' -- SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)' -+ SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)' - SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)' diff --git a/security/krb5-114/files/patch-lib-krb5-os-localaddr.c b/security/krb5-114/files/patch-lib-krb5-os-localaddr.c deleted file mode 100644 index 06b6043f22c9..000000000000 --- a/security/krb5-114/files/patch-lib-krb5-os-localaddr.c +++ /dev/null @@ -1,75 +0,0 @@ ---- lib/krb5/os/localaddr.c.orig 2009-10-30 20:17:27.000000000 -0700 -+++ lib/krb5/os/localaddr.c 2010-04-19 12:39:56.707090973 -0700 -@@ -175,6 +175,7 @@ - } - #endif - -+#if 0 - static int - is_loopback_address(struct sockaddr *sa) - { -@@ -191,6 +192,7 @@ - return 0; - } - } -+#endif - - #ifdef HAVE_IFADDRS_H - #include <ifaddrs.h> -@@ -467,12 +469,14 @@ - ifp->ifa_flags &= ~IFF_UP; - continue; - } -+#if 0 - if (is_loopback_address(ifp->ifa_addr)) { - /* Pretend it's not up, so the second pass will skip - it. */ - ifp->ifa_flags &= ~IFF_UP; - continue; - } -+#endif - /* If this address is a duplicate, punt. */ - match = 0; - for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) { -@@ -601,11 +605,13 @@ - } - /*@=moduncon@*/ - -+#if 0 - /* None of the current callers want loopback addresses. */ - if (is_loopback_address((struct sockaddr *)&lifr->lifr_addr)) { - Tprintf ((" loopback\n")); - goto skip; - } -+#endif - /* Ignore interfaces that are down. */ - if ((lifreq.lifr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); -@@ -772,11 +778,13 @@ - } - /*@=moduncon@*/ - -+#if 0 - /* None of the current callers want loopback addresses. */ - if (is_loopback_address(&lifr->iflr_addr)) { - Tprintf ((" loopback\n")); - goto skip; - } -+#endif - /* Ignore interfaces that are down. */ - if ((lifreq.iflr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); -@@ -987,11 +995,13 @@ - } - /*@=moduncon@*/ - -+#if 0 - /* None of the current callers want loopback addresses. */ - if (is_loopback_address(&ifreq.ifr_addr)) { - Tprintf ((" loopback\n")); - goto skip; - } -+#endif - /* Ignore interfaces that are down. */ - if ((ifreq.ifr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); diff --git a/security/krb5-114/files/patch-lib__gssapi__krb5__import_name.c b/security/krb5-114/files/patch-lib__gssapi__krb5__import_name.c deleted file mode 100644 index 40f116af2196..000000000000 --- a/security/krb5-114/files/patch-lib__gssapi__krb5__import_name.c +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 -+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 -@@ -33,6 +33,11 @@ - #endif - #endif - -+#include <sys/param.h> -+#if __FreeBSD_version < 500100 -+#include <stdio.h> -+#endif -+ - #ifdef HAVE_STRING_H - #include <string.h> - #else diff --git a/security/krb5-114/files/patch-util_et_Makefile.in b/security/krb5-114/files/patch-util_et_Makefile.in deleted file mode 100644 index 51d256533dcb..000000000000 --- a/security/krb5-114/files/patch-util_et_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- util/et/Makefile.in.orig 2017-09-25 09:29:00.000000000 -0700 -+++ util/et/Makefile.in 2018-07-01 21:15:59.804675000 -0700 -@@ -144,6 +144,9 @@ - install-unix:: compile_et.1 - $(INSTALL_DATA) $(srcdir)/compile_et.1 $(DESTDIR)$(CLIENT_MANDIR)/compile_et.1 - -+install-unix:: com_err.3 -+ $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(SUBR_MANDIR)/com_err.3 -+ - - ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),) - diff --git a/security/krb5-114/pkg-descr b/security/krb5-114/pkg-descr deleted file mode 100644 index 5940aeab0176..000000000000 --- a/security/krb5-114/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -Kerberos V5 is an authentication system developed at MIT. -WWW: http://web.mit.edu/kerberos/ - -Abridged from the User Guide: - Under Kerberos, a client sends a request for a ticket to the - Key Distribution Center (KDC). The KDC creates a ticket-granting - ticket (TGT) for the client, encrypts it using the client's - password as the key, and sends the encrypted TGT back to the - client. The client then attempts to decrypt the TGT, using - its password. If the client successfully decrypts the TGT, it - keeps the decrypted TGT, which indicates proof of the client's - identity. The TGT permits the client to obtain additional tickets, - which give permission for specific services. - Since Kerberos negotiates authenticated, and optionally encrypted, - communications between two points anywhere on the internet, it - provides a layer of security that is not dependent on which side of a - firewall either client is on. - The Kerberos V5 package is designed to be easy to use. Most of the - commands are nearly identical to UNIX network programs you are already - used to. Kerberos V5 is a single-sign-on system, which means that you - have to type your password only once per session, and Kerberos does - the authenticating and encrypting transparently. - -Jacques Vidrine <n@nectar.com> diff --git a/security/krb5-114/pkg-plist b/security/krb5-114/pkg-plist deleted file mode 100644 index 862ccb66b36e..000000000000 --- a/security/krb5-114/pkg-plist +++ /dev/null @@ -1,169 +0,0 @@ -bin/compile_et -bin/gss-client -bin/k5srvutil -bin/kadmin -bin/kdestroy -bin/kinit -bin/klist -bin/kpasswd -bin/krb5-config -@mode 04755 -@owner root -@group wheel -bin/ksu -@mode -@owner root -@group wheel -bin/kswitch -bin/ktutil -bin/kvno -bin/sclient -bin/sim_client -bin/uuclient -include/com_err.h -include/gssapi.h -include/gssapi/gssapi.h -include/gssapi/gssapi_ext.h -include/gssapi/gssapi_generic.h -include/gssapi/gssapi_krb5.h -include/gssapi/mechglue.h -include/gssrpc/auth.h -include/gssrpc/auth_gss.h -include/gssrpc/auth_gssapi.h -include/gssrpc/auth_unix.h -include/gssrpc/clnt.h -include/gssrpc/netdb.h -include/gssrpc/pmap_clnt.h -include/gssrpc/pmap_prot.h -include/gssrpc/pmap_rmt.h -include/gssrpc/rename.h -include/gssrpc/rpc.h -include/gssrpc/rpc_msg.h -include/gssrpc/svc.h -include/gssrpc/svc_auth.h -include/gssrpc/types.h -include/gssrpc/xdr.h -include/krad.h -include/krb5.h -include/krb5/ccselect_plugin.h -include/krb5/clpreauth_plugin.h -include/krb5/hostrealm_plugin.h -include/krb5/kadm5_hook_plugin.h -include/krb5/kdcpreauth_plugin.h -include/krb5/localauth_plugin.h -include/krb5/krb5.h -include/krb5/locate_plugin.h -include/krb5/plugin.h -include/krb5/pwqual_plugin.h -include/kadm5/admin.h -include/kadm5/chpass_util_strings.h -include/kadm5/kadm_err.h -include/kdb.h -include/krb5/preauth_plugin.h -include/profile.h -include/verto-module.h -include/verto.h -lib/libcom_err.so -lib/libcom_err.so.3 -lib/libcom_err.so.3.0 -lib/libgssapi_krb5.so -lib/libgssapi_krb5.so.2 -lib/libgssapi_krb5.so.2.2 -lib/libgssrpc.so -lib/libgssrpc.so.4 -lib/libgssrpc.so.4.2 -lib/libk5crypto.so -lib/libk5crypto.so.3 -lib/libk5crypto.so.3.1 -lib/libkadm5clnt.so -lib/libkadm5clnt_mit.so -lib/libkadm5clnt_mit.so.10 -lib/libkadm5clnt_mit.so.10.0 -lib/libkadm5srv.so -lib/libkadm5srv_mit.so -lib/libkadm5srv_mit.so.10 -lib/libkadm5srv_mit.so.10.0 -lib/libkdb5.so -lib/libkdb5.so.8 -lib/libkdb5.so.8.0 -lib/libkrb5.so -lib/libkrb5.so.3 -lib/libkrb5.so.3.3 -lib/libkrb5support.so -lib/libkrb5support.so.0 -lib/libkrb5support.so.0.1 -lib/krb5/plugins/kdb/db2.so -lib/krb5/plugins/tls/k5tls.so -%%LDAP%%lib/krb5/plugins/kdb/kldap.so -lib/krb5/plugins/preauth/otp.so -lib/krb5/plugins/preauth/pkinit.so -lib/krb5/plugins/preauth/test.so -%%LDAP%%lib/libkdb_ldap.so -%%LDAP%%lib/libkdb_ldap.so.1 -%%LDAP%%lib/libkdb_ldap.so.1.0 -lib/libkrad.so -lib/libkrad.so.0 -lib/libkrad.so.0.0 -lib/libverto.so -lib/libverto.so.0 -lib/libverto.so.0.0 -libdata/pkgconfig/gssrpc.pc -libdata/pkgconfig/kadm-client.pc -libdata/pkgconfig/kadm-server.pc -libdata/pkgconfig/kdb.pc -libdata/pkgconfig/krb5-gssapi.pc -libdata/pkgconfig/krb5.pc -libdata/pkgconfig/mit-krb5-gssapi.pc -libdata/pkgconfig/mit-krb5.pc -man/man1/compile_et.1.gz -man/man1/k5srvutil.1.gz -man/man1/kadmin.1.gz -man/man1/kdestroy.1.gz -man/man1/kinit.1.gz -man/man1/klist.1.gz -man/man1/kpasswd.1.gz -man/man1/krb5-config.1.gz -man/man1/ksu.1.gz -man/man1/kswitch.1.gz -man/man1/ktutil.1.gz -man/man1/kvno.1.gz -man/man1/sclient.1.gz -man/man3/com_err.3.gz -man/man5/.k5identity.5.gz -man/man5/.k5login.5.gz -man/man5/k5identity.5.gz -man/man5/k5login.5.gz -man/man5/kadm5.acl.5.gz -man/man5/kdc.conf.5.gz -man/man5/krb5.conf.5.gz -man/man8/kadmin.local.8.gz -man/man8/kadmind.8.gz -man/man8/kdb5_ldap_util.8.gz -man/man8/kdb5_util.8.gz -man/man8/kprop.8.gz -man/man8/kpropd.8.gz -man/man8/kproplog.8.gz -man/man8/krb5kdc.8.gz -man/man8/sserver.8.gz -sbin/gss-server -sbin/kadmin.local -sbin/kadmind -%%LDAP%%sbin/kdb5_ldap_util -sbin/kdb5_util -sbin/kprop -sbin/kpropd -sbin/kproplog -sbin/krb5-send-pr -sbin/krb5kdc -sbin/sim_server -sbin/sserver -sbin/uuserver -share/et/et_c.awk -share/et/et_h.awk -%%NLS%%share/locale/en_US/LC_MESSAGES/mit-krb5.mo -%%LDAP%%%%DATADIR%%/kerberos.schema -%%LDAP%%%%DATADIR%%/kerberos.ldif -@dir lib/krb5/plugins/authdata -@dir lib/krb5/plugins/libkrb5 -@dir var/run/krb5kdc -@dir var/krb5kdc diff --git a/sysutils/Makefile b/sysutils/Makefile index 32c821ffdc2c..b6a7a90de6d7 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -56,7 +56,6 @@ SUBDIR += asmem SUBDIR += asmon SUBDIR += asusoled - SUBDIR += ataidle SUBDIR += atf-allwinner SUBDIR += atitvout SUBDIR += atop @@ -157,7 +156,6 @@ SUBDIR += cfengine-masterfiles37 SUBDIR += cfengine-masterfiles38 SUBDIR += cfengine-masterfiles39 - SUBDIR += cfengine22 SUBDIR += cfengine310 SUBDIR += cfengine311 SUBDIR += cfengine312 @@ -1272,8 +1270,6 @@ SUBDIR += syslog-ng317 SUBDIR += syslog-ng318 SUBDIR += syslog-ng319 - SUBDIR += syslog-ng36 - SUBDIR += syslog-ng37 SUBDIR += syslog-ng39 SUBDIR += syslogger SUBDIR += sysrc diff --git a/sysutils/ataidle/Makefile b/sysutils/ataidle/Makefile deleted file mode 100644 index a7911657ba94..000000000000 --- a/sysutils/ataidle/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Created by: Bruce Cran <bruce@cran.org.uk> -# $FreeBSD$ - -PORTNAME= ataidle -PORTVERSION= 2.7.2 -CATEGORIES= sysutils -MASTER_SITES= http://bluestop.org/ataidle/ - -MAINTAINER= wg@FreeBSD.org -COMMENT= Utility to spin down ATA drives - -LICENSE= BSD3CLAUSE - -DEPRECATED= obsoleted by camcontrol(8) -EXPIRATION_DATE= 2018-12-31 - -USE_RC_SUBR= ${PORTNAME} -PORTDOCS= Changelog README -PLIST_FILES= sbin/ataidle \ - man/man8/ataidle.8.gz - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ataidle ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/ataidle.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/sysutils/ataidle/distinfo b/sysutils/ataidle/distinfo deleted file mode 100644 index 5e40466a11d5..000000000000 --- a/sysutils/ataidle/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ataidle-2.7.2.tar.gz) = db7737059b7371eb8b876e13aae584dbc32ee5388df1fd6583b4ee33a91024f1 -SIZE (ataidle-2.7.2.tar.gz) = 29790 diff --git a/sysutils/ataidle/files/ataidle.in b/sysutils/ataidle/files/ataidle.in deleted file mode 100644 index 928ab02e337f..000000000000 --- a/sysutils/ataidle/files/ataidle.in +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -# PROVIDE: ataidle -# BEFORE: LOGIN - -# -# Add the following lines to /etc/rc.conf to enable ataidle: -# -# ataidle_enable (bool): set to NO by default. -# Set to YES to enable ataidle. -# ataidle_devices: list of devices on which to run ataidle -# ataidle_adaX: parameters to pass to ataidle(8) - -# Example: -# Put the disks ada0, ada1 and ada2 into Standby mode after 60 minutes: -# -# ataidle_devices="ada0 ada1 ada2" -# ataidle_ada0="-S 60" -# ataidle_ada1="-S 60" -# ataidle_ada2="-S 60" -# - -. /etc/rc.subr - -name="ataidle" -rcvar=ataidle_enable - -command=%%PREFIX%%/sbin/${name} -start_cmd=ataidle_start - -load_rc_config $name - -: ${ataidle_enable="NO"} - -ataidle_start() -{ - if [ -n "${ataidle_device}" -a -z "${ataidle_devices}" ]; then - echo "warning: old ataidle rc settings found" - ataidle_devices=${ataidle_device} - fi - - if [ -n "${ataidle_devices}" ]; then - for i in ${ataidle_devices}; do - eval ataidle_args=\$ataidle_${i} - echo "ataidle: configuring device /dev/${i}" - ${command} ${ataidle_args} /dev/${i} - done - fi -} - -run_rc_command "$1" diff --git a/sysutils/ataidle/pkg-descr b/sysutils/ataidle/pkg-descr deleted file mode 100644 index 22f0c853629f..000000000000 --- a/sysutils/ataidle/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -ATAidle is a utility to set the power management and performance -features of ATA hard drives. This includes standby timeouts, power -(APM), write cache and acoustic (AAM) level settings, and it can show -details about the installed devices. - -WWW: http://bluestop.org/ataidle/ diff --git a/sysutils/cfengine22/Makefile b/sysutils/cfengine22/Makefile deleted file mode 100644 index 13414365800e..000000000000 --- a/sysutils/cfengine22/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# Created by: jseger@FreeBSD.org -# $FreeBSD$ - -PORTNAME= cfengine -PORTVERSION= 2.2.10 -PORTREVISION= 4 -CATEGORIES= sysutils -MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ -PKGNAMESUFFIX= 22 - -MAINTAINER= cy@FreeBSD.org -# gjb@FreeBSD.org is also committer for this port -# skreuzer@FreeBSD.org is also committer for this port -COMMENT= Systems administration tool for networks -CPE_VENDOR= gnu - -DEPRECATED= No longeer supported by cfengine.com -EXPIRATION_DATE= 2018-12-31 - -FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} - -CONFLICTS= cfengine-3* cfengine-devel-* cfengine3* - -USE_RC_SUBR= cfexecd cfservd - -USES= bdb cpe libtool makeinfo shebangfix ssl -SHEBANG_FILES= contrib/cfdoc - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-docs \ - --docdir=${DOCSDIR} \ - --htmldir=${DOCSDIR}/html -CONFIGURE_ENV+= BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \ - BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \ - BERKELEY_DB_LIB=-l${BDB_LIB_NAME} - -INFO= cfengine-Tutorial cfengine-Reference - -OPTIONS_DEFINE= DOCS EXAMPLES - -post-patch: - @${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\ - ${WRKSRC}/doc/Makefile.in \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\ - ${WRKSRC}/doc/Makefile.in \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/^pkgdatadir/s!=.*!= ${EXAMPLESDIR}!'\ - ${WRKSRC}/inputs/Makefile.in \ - ${WRKSRC}/contrib/Makefile.in - -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} != "openssl" -BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl -BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl -.endif - -.include <bsd.port.post.mk> diff --git a/sysutils/cfengine22/distinfo b/sysutils/cfengine22/distinfo deleted file mode 100644 index 26ed8c1ec4db..000000000000 --- a/sysutils/cfengine22/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cfengine-2.2.10.tar.gz) = f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783 -SIZE (cfengine-2.2.10.tar.gz) = 2690333 diff --git a/sysutils/cfengine22/files/cfexecd.in b/sysutils/cfengine22/files/cfexecd.in deleted file mode 100644 index 0edae9657b98..000000000000 --- a/sysutils/cfengine22/files/cfexecd.in +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: cfexecd -# REQUIRE: SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf[.local] to enable cfexecd(8) -# -# cfexecd_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable cfexecd. -# cfexecd_flags (str): Custom additional arguments to be passed -# to cfexecd (default empty). -# - -. /etc/rc.subr - -name="cfexecd" -rcvar=cfexecd_enable - -command="%%PREFIX%%/sbin/${name}" - -load_rc_config $name - -: ${cfexecd_enable="NO"} - -run_rc_command "$1" diff --git a/sysutils/cfengine22/files/cfservd.in b/sysutils/cfengine22/files/cfservd.in deleted file mode 100644 index 068c43a32437..000000000000 --- a/sysutils/cfengine22/files/cfservd.in +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: cfservd -# REQUIRE: SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf[.local] to enable cfservd(8) -# -# cfservd_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable cfservd. -# cfservd_flags (str): Custom additional arguments to be passed -# to cfservd (default empty). -# - -. /etc/rc.subr - -name="cfservd" -rcvar=cfservd_enable - -command="%%PREFIX%%/sbin/${name}" - -load_rc_config $name - -: ${cfservd_enable="NO"} - -run_rc_command "$1" diff --git a/sysutils/cfengine22/files/patch-Makefile.in b/sysutils/cfengine22/files/patch-Makefile.in deleted file mode 100644 index 558288e16305..000000000000 --- a/sysutils/cfengine22/files/patch-Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.in.orig Mon Aug 4 10:55:48 2008 -+++ Makefile.in Tue Aug 12 23:03:09 2008 -@@ -187,7 +187,7 @@ - builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ --docdir = $(pkgdatadir) -+docdir = $(prefix)/share/doc/cfengine - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ -@@ -225,7 +225,11 @@ - @BUILD_DOC_TRUE@DOC_DIR = doc - SUBDIRS = pub src contrib inputs $(DOC_DIR) - EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE --doc_DATA = README ChangeLog INSTALL NEWS -+.if defined(NOPORTDOCS) -+doc_DATA = -+.else -+doc_DATA = README ChangeLog INSTALL NEWS AUTHORS TODO -+.endif - - # - # Some basic clean ups -@@ -300,6 +304,7 @@ - -rm -f libtool - install-docDATA: $(doc_DATA) - @$(NORMAL_INSTALL) -+.if !defined(NOPORTDOCS) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" - @list='$(doc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -@@ -307,6 +312,7 @@ - echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ - $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ - done -+.endif - - uninstall-docDATA: - @$(NORMAL_UNINSTALL) diff --git a/sysutils/cfengine22/files/patch-contrib_Makefile.in b/sysutils/cfengine22/files/patch-contrib_Makefile.in deleted file mode 100644 index 5dac09930b39..000000000000 --- a/sysutils/cfengine22/files/patch-contrib_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- contrib/Makefile.in.orig 2008-07-01 22:50:46.000000000 -0400 -+++ contrib/Makefile.in 2008-07-01 22:51:08.000000000 -0400 -@@ -251,6 +251,7 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) - @$(NORMAL_INSTALL) -+.if !defined(NOPORTEXAMPLES) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -@@ -260,6 +261,7 @@ - $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ - else :; fi; \ - done -+.endif - - uninstall-pkgdataSCRIPTS: - @$(NORMAL_UNINSTALL) diff --git a/sysutils/cfengine22/files/patch-doc_Makefile.in b/sysutils/cfengine22/files/patch-doc_Makefile.in deleted file mode 100644 index ccb1cd36d3f5..000000000000 --- a/sysutils/cfengine22/files/patch-doc_Makefile.in +++ /dev/null @@ -1,75 +0,0 @@ ---- doc/Makefile.in.orig 2008-12-24 06:42:47.000000000 -0800 -+++ doc/Makefile.in 2009-02-02 14:27:17.000000000 -0800 -@@ -220,7 +220,7 @@ - man_MANS = cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfshow.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 - - # Info used in building the Info files --info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo -+info_TEXINFOS = - infofiles = $(info_TEXINFOS:.texinfo=.info) - MAKEINFOHTML = $(MAKEINFO) --html --no-split --css-include=cfcomdoc.css - -@@ -543,6 +543,7 @@ - done - - dist-info: $(INFO_DEPS) -+.if !defined(NOPORTDOCS) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(INFO_DEPS)'; \ - for base in $$list; do \ -@@ -559,6 +560,7 @@ - else :; fi; \ - done; \ - done -+.endif - - mostlyclean-aminfo: - -rm -rf cfengine-Reference.aux cfengine-Reference.cp cfengine-Reference.cps \ -@@ -648,6 +650,7 @@ - done - install-docDATA: $(doc_DATA) - @$(NORMAL_INSTALL) -+.if !defined(NOPORTDOCS) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" - @list='$(doc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -@@ -655,6 +658,7 @@ - echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ - $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ - done -+.endif - - uninstall-docDATA: - @$(NORMAL_UNINSTALL) -@@ -665,6 +669,7 @@ - done - install-htmlDATA: $(html_DATA) - @$(NORMAL_INSTALL) -+.if !defined(NOPORTDOCS) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" - @list='$(html_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -@@ -672,6 +677,7 @@ - echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ - $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ - done -+.endif - - uninstall-htmlDATA: - @$(NORMAL_UNINSTALL) -@@ -808,6 +814,7 @@ - install-info: install-info-am - - install-info-am: $(INFO_DEPS) -+.if !defined(NOPORTDOCS) - @$(NORMAL_INSTALL) - test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -@@ -837,6 +844,7 @@ - install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ - done; \ - else : ; fi -+.endif - install-man: install-man8 - - install-pdf: install-pdf-am diff --git a/sysutils/cfengine22/files/patch-inputs_Makefile.in b/sysutils/cfengine22/files/patch-inputs_Makefile.in deleted file mode 100644 index bac3996a6dc6..000000000000 --- a/sysutils/cfengine22/files/patch-inputs_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- inputs/Makefile.in.orig 2008-07-01 22:51:16.000000000 -0400 -+++ inputs/Makefile.in 2008-07-01 22:51:37.000000000 -0400 -@@ -267,6 +267,7 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) - @$(NORMAL_INSTALL) -+.if !defined(NOPORTEXAMPLES) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -@@ -276,6 +277,7 @@ - $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ - else :; fi; \ - done -+.endif - - uninstall-pkgdataSCRIPTS: - @$(NORMAL_UNINSTALL) diff --git a/sysutils/cfengine22/pkg-descr b/sysutils/cfengine22/pkg-descr deleted file mode 100644 index e3e43014a118..000000000000 --- a/sysutils/cfengine22/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Cfengine, or the configuration engine is an agent/software robot and a -very high level language for building expert systems to administrate -and configure large computer networks. Cfengine uses the idea of -classes and a primitive form of intelligence to define and automate -the configuration and maintenance of system state, for small to huge -configurations. Cfengine is designed to be a part of a computer immune -system. - -WWW: https://cfengine.com/ diff --git a/sysutils/cfengine22/pkg-plist b/sysutils/cfengine22/pkg-plist deleted file mode 100644 index d7bcf584c41b..000000000000 --- a/sysutils/cfengine22/pkg-plist +++ /dev/null @@ -1,55 +0,0 @@ -lib/libcfengine.a -sbin/cfagent -sbin/cfdoc -sbin/cfenvd -sbin/cfenvgraph -sbin/cfetool -sbin/cfetoolgraph -sbin/cfexecd -sbin/cfkey -sbin/cfrun -sbin/cfservd -sbin/cfshow -man/man8/cfagent.8.gz -man/man8/cfengine.8.gz -man/man8/cfenvd.8.gz -man/man8/cfenvgraph.8.gz -man/man8/cfetoolcheck.8.gz -man/man8/cfetoolcreate.8.gz -man/man8/cfetooldump.8.gz -man/man8/cfetoolgraph.8.gz -man/man8/cfetoolimport.8.gz -man/man8/cfetoolinfo.8.gz -man/man8/cfetoolupdate.8.gz -man/man8/cfexecd.8.gz -man/man8/cfkey.8.gz -man/man8/cfrun.8.gz -man/man8/cfservd.8.gz -man/man8/cfshow.8.gz -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.chflags.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.freebsd.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.ftp.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.groups.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.linux.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.main.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.motd.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.preconf.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.services.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.site.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.solaris.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.sun4.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.users.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf-advanced.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfengine.el -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrc.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrun.hosts.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfservd.conf.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/update.conf.example -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%@dir %%DOCSDIR%%/html diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile deleted file mode 100644 index 8f791fad4828..000000000000 --- a/sysutils/syslog-ng36/Makefile +++ /dev/null @@ -1,156 +0,0 @@ -# Created by: Ivan Lago <ivan.lago@ifom-ieo-campus.it> -# $FreeBSD$ - -PORTNAME= syslog-ng -DISTVERSION= 3.6.4 -PORTREVISION= 5 -CATEGORIES= sysutils -MASTER_SITES= https://github.com/balabit/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \ - http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/ \ - -.if !defined(MASTERDIR) -PKGNAMESUFFIX= 36 -.endif - -MAINTAINER= cy@FreeBSD.org -COMMENT= Powerful syslogd replacement - -DEPRECATED= No longer officially supported by Balabit, does not support openssl111 -EXPIRATION_DATE= 2018-12-31 -BROKEN_sparc64= fails to compile: gcc core dump - -LIB_DEPENDS= libevtlog.so:sysutils/eventlog \ - libpcre.so:devel/pcre - -CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ - syslog-ng[0-9][0-9]-[0-9]* \ - syslog-ng[0-9][0-9][0-9]-[0-9]* \ - syslog-ng-devel-[0-9]* -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - -MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL -OPTIONS_DEFAULT= OPENSSL JSON -TCP_WRAPPERS_DESC= Build with TCP Wrappers -SQL_DESC= Build with database (libdbi) support -SPOOF_DESC= Build with spoof source support -SMTP_DESC= Build with SMTP support -JSON_DESC= Build with JSON-C support -GEOIP_DESC= Build with GeoIP support -REDIS_DESC= Build with Redis support - -USES= alias compiler:c11 gmake libtool pathfix pkgconfig -USE_LDCONFIG= yes -USE_RC_SUBR= syslog-ng -GNU_CONFIGURE= yes -USE_GNOME= glib20 -SUB_FILES= pkg-message -INSTALL_TARGET= install-strip - -CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ - --enable-dynamic-linking --disable-linux-caps \ - --enable-debug --enable-manpages \ - --datadir=${PREFIX}/share/syslog-ng/ - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MOPENSSL} -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 -.if ${SSL_DEFAULT} != "openssl" -BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl -BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl -.endif -.endif -USES+= ssl -CONFIGURE_ARGS+= --enable-ssl -CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" -PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so -.else -CONFIGURE_ARGS+= --disable-ssl -.endif - -.if ${PORT_OPTIONS:MTCP_WRAPPERS} -CONFIGURE_ARGS+= --enable-tcp-wrapper -.else -CONFIGURE_ARGS+= --disable-tcp-wrapper -.endif - -.if ${PORT_OPTIONS:MSPOOF} -LIB_DEPENDS+= libnet.so:net/libnet -CONFIGURE_ARGS+= --enable-spoof-source -.else -CONFIGURE_ARGS+= --disable-spoof-source -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MGEOIP} -CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= libGeoIP.so:net/GeoIP -CONFIGURE_ENV+= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" -PLIST_FILES+= lib/syslog-ng/libtfgeoip.so -.else -CONFIGURE_ARGS+= --disable-geoip -.endif - -.if ${PORT_OPTIONS:MREDIS} -CONFIGURE_ARGS+= --enable-redis --with-libhiredis=${LOCALBASE}/lib -LIB_DEPENDS+= libhiredis.so:databases/hiredis -PLIST_FILES+= lib/syslog-ng/libredis.so -.else -CONFIGURE_ARGS+= --disable-redis -.endif - -.if ${PORT_OPTIONS:MSMTP} -CONFIGURE_ARGS+= --with-libesmtp=/usr/local/ -LIB_DEPENDS+= libesmtp.so:mail/libesmtp -PLIST_FILES+= lib/syslog-ng/libafsmtp.so -.else -CONFIGURE_ARGS+= --disable-smtp -.endif - -.if ${PORT_OPTIONS:MSQL} -LIB_DEPENDS+= libdbi.so:databases/libdbi -CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi" -CONFIGURE_ARGS+= --enable-sql -LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES+= lib/syslog-ng/libafsql.so -.else -CONFIGURE_ARGS+= --disable-sql -.endif - -.if ${PORT_OPTIONS:MJSON} -LIB_DEPENDS+= libjson-c.so:devel/json-c -CONFIGURE_ARGS+= --enable-json -PLIST_FILES+= lib/syslog-ng/libjson-plugin.so -.else -CONFIGURE_ARGS+= --disable-json -.endif - -post-patch: - @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist - @${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR} -.endif - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \ - ${STAGEDIR}${PREFIX}/etc - ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \ - ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc - ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ - ${STAGEDIR}${PREFIX}/include/syslog-ng/ - -.include <bsd.port.mk> diff --git a/sysutils/syslog-ng36/distinfo b/sysutils/syslog-ng36/distinfo deleted file mode 100644 index eaa442b75f91..000000000000 --- a/sysutils/syslog-ng36/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (syslog-ng-3.6.4.tar.gz) = 7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7 -SIZE (syslog-ng-3.6.4.tar.gz) = 3276432 diff --git a/sysutils/syslog-ng36/files/patch-configure b/sysutils/syslog-ng36/files/patch-configure deleted file mode 100644 index c3c533b2df4c..000000000000 --- a/sysutils/syslog-ng36/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2016-03-22 04:58:27.000000000 -0700 -+++ configure 2016-03-23 20:51:10.722420000 -0700 -@@ -14996,9 +14996,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNET" >&5 - $as_echo_n "checking for LIBNET... " >&6; } - if test "x$with_libnet" = "x"; then -- LIBNET_CONFIG="`which libnet-config`" -+ LIBNET_CONFIG="`which libnet11-config`" - else -- LIBNET_CONFIG="$with_libnet/libnet-config" -+ LIBNET_CONFIG="$with_libnet/libnet11-config" - fi - - if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then diff --git a/sysutils/syslog-ng36/files/patch-modules__afsocket__afinet-dest.c b/sysutils/syslog-ng36/files/patch-modules__afsocket__afinet-dest.c deleted file mode 100644 index 7af83d8fb2c0..000000000000 --- a/sysutils/syslog-ng36/files/patch-modules__afsocket__afinet-dest.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/afsocket/afinet-dest.c.orig 2016-03-22 02:39:13.000000000 -0700 -+++ modules/afsocket/afinet-dest.c 2016-03-23 22:07:14.289961000 -0700 -@@ -42,7 +42,7 @@ - #endif - - #if ENABLE_SPOOF_SOURCE --#include <libnet.h> -+#include <libnet11/libnet.h> - #endif - - #if _GNU_SOURCE_DEFINED diff --git a/sysutils/syslog-ng36/files/pkg-message.in b/sysutils/syslog-ng36/files/pkg-message.in deleted file mode 100644 index 36cb7e65a243..000000000000 --- a/sysutils/syslog-ng36/files/pkg-message.in +++ /dev/null @@ -1,29 +0,0 @@ - -syslog-ng is now installed! To replace FreeBSD's standard syslogd -(/usr/sbin/syslogd), complete these steps: - -1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf - (a sample named syslog-ng.conf.sample has been included in - %%PREFIX%%/etc). Note that this is a change in 2.0.2 - version, previous ones put the config file in - %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update - move that file in the right place - -2. Configure syslog-ng to start automatically by adding the following - to /etc/rc.conf: - - syslog_ng_enable="YES" - -3. Prevent the standard FreeBSD syslogd from starting automatically by - adding a line to the end of your /etc/rc.conf file that reads: - - syslogd_enable="NO" - -4. Shut down the standard FreeBSD syslogd: - - kill `cat /var/run/syslog.pid` - -5. Start syslog-ng: - - %%PREFIX%%/etc/rc.d/syslog-ng start - diff --git a/sysutils/syslog-ng36/files/syslog-ng.conf.sample b/sysutils/syslog-ng36/files/syslog-ng.conf.sample deleted file mode 100644 index 7fa32733ffd1..000000000000 --- a/sysutils/syslog-ng36/files/syslog-ng.conf.sample +++ /dev/null @@ -1,185 +0,0 @@ -@version:3.6 -@include "scl.conf" - -# -# This sample configuration file is essentially equilivent to the stock -# FreeBSD /etc/syslog.conf file. -# -# $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.conf.sample 340872 2014-01-24 00:14:07Z mat $ -# - -# -# options -# -options { chain_hostnames(off); flush_lines(0); threaded(yes); }; - -# -# sources -# -source src { system(); - udp(); internal(); }; - -# -# destinations -# -destination messages { file("/var/log/messages"); }; -destination security { file("/var/log/security"); }; -destination authlog { file("/var/log/auth.log"); }; -destination maillog { file("/var/log/maillog"); }; -destination lpd-errs { file("/var/log/lpd-errs"); }; -destination xferlog { file("/var/log/xferlog"); }; -destination cron { file("/var/log/cron"); }; -destination debuglog { file("/var/log/debug.log"); }; -destination consolelog { file("/var/log/console.log"); }; -destination all { file("/var/log/all.log"); }; -destination newscrit { file("/var/log/news/news.crit"); }; -destination newserr { file("/var/log/news/news.err"); }; -destination newsnotice { file("/var/log/news/news.notice"); }; -destination slip { file("/var/log/slip.log"); }; -destination ppp { file("/var/log/ppp.log"); }; -destination console { file("/dev/console"); }; -destination allusers { usertty("*"); }; -#destination loghost { udp("loghost" port(514)); }; - -# -# log facility filters -# -filter f_auth { facility(auth); }; -filter f_authpriv { facility(authpriv); }; -filter f_not_authpriv { not facility(authpriv); }; -#filter f_console { facility(console); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_ftp { facility(ftp); }; -filter f_kern { facility(kern); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_news { facility(news); }; -filter f_security { facility(security); }; -filter f_user { facility(user); }; -filter f_uucp { facility(uucp); }; -filter f_local0 { facility(local0); }; -filter f_local1 { facility(local1); }; -filter f_local2 { facility(local2); }; -filter f_local3 { facility(local3); }; -filter f_local4 { facility(local4); }; -filter f_local5 { facility(local5); }; -filter f_local6 { facility(local6); }; -filter f_local7 { facility(local7); }; - -# -# log level filters -# -filter f_emerg { level(emerg); }; -filter f_alert { level(alert..emerg); }; -filter f_crit { level(crit..emerg); }; -filter f_err { level(err..emerg); }; -filter f_warning { level(warning..emerg); }; -filter f_notice { level(notice..emerg); }; -filter f_info { level(info..emerg); }; -filter f_debug { level(debug..emerg); }; -filter f_is_debug { level(debug); }; - -# -# program filters -# -filter f_ppp { program("ppp"); }; -filter f_slip { program("startslip"); }; - -# -# *.err;kern.warning;auth.notice;mail.crit /dev/console -# -log { source(src); filter(f_err); destination(console); }; -log { source(src); filter(f_kern); filter(f_warning); destination(console); }; -log { source(src); filter(f_auth); filter(f_notice); destination(console); }; -log { source(src); filter(f_mail); filter(f_crit); destination(console); }; - -# -# *.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages -# -log { source(src); filter(f_notice); filter(f_not_authpriv); destination(messages); }; -log { source(src); filter(f_kern); filter(f_debug); destination(messages); }; -log { source(src); filter(f_lpr); filter(f_info); destination(messages); }; -log { source(src); filter(f_mail); filter(f_crit); destination(messages); }; -log { source(src); filter(f_news); filter(f_err); destination(messages); }; - -# -# security.* /var/log/security -# -log { source(src); filter(f_security); destination(security); }; - -# -# auth.info;authpriv.info /var/log/auth.log -log { source(src); filter(f_auth); filter(f_info); destination(authlog); }; -log { source(src); filter(f_authpriv); filter(f_info); destination(authlog); }; - -# -# mail.info /var/log/maillog -# -log { source(src); filter(f_mail); filter(f_info); destination(maillog); }; - -# -# lpr.info /var/log/lpd-errs -# -log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); }; - -# -# ftp.info /var/log/xferlog -# -log { source(src); filter(f_ftp); filter(f_info); destination(xferlog); }; - -# -# cron.* /var/log/cron -# -log { source(src); filter(f_cron); destination(cron); }; - -# -# *.=debug /var/log/debug.log -# -log { source(src); filter(f_is_debug); destination(debuglog); }; - -# -# *.emerg * -# -log { source(src); filter(f_emerg); destination(allusers); }; - -# -# uncomment this to log all writes to /dev/console to /var/log/console.log -# console.info /var/log/console.log -# -#log { source(src); filter(f_console); filter(f_info); destination(consolelog); }; - -# -# uncomment this to enable logging of all log messages to /var/log/all.log -# touch /var/log/all.log and chmod it to mode 600 before it will work -# *.* /var/log/all.log -# -#log { source(src); destination(all); }; - -# -# uncomment this to enable logging to a remote loghost named loghost -# *.* @loghost -# -#log { source(src); destination(loghost); }; - -# -# uncomment these if you're running inn -# news.crit /var/log/news/news.crit -# news.err /var/log/news/news.err -# news.notice /var/log/news/news.notice -# -#log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; -#log { source(src); filter(f_news); filter(f_err); destination(newserr); }; -#log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; - -# -# !startslip -# *.* /var/log/slip.log -# -log { source(src); filter(f_slip); destination(slip); }; - -# -# !ppp -# *.* /var/log/ppp.log -# -log { source(src); filter(f_ppp); destination(ppp); }; diff --git a/sysutils/syslog-ng36/files/syslog-ng.in b/sysutils/syslog-ng36/files/syslog-ng.in deleted file mode 100644 index ae24e4984375..000000000000 --- a/sysutils/syslog-ng36/files/syslog-ng.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.in 340872 2014-01-24 00:14:07Z mat $ -# - -# PROVIDE: syslogd -# REQUIRE: mountcritremote cleanvar ldconfig -# BEFORE: SERVERS - -# -# Add the following line to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -#syslog_ng_enable="YES" -#syslog_ng_config="-u daemon" -#syslog_ng_pid="/var/run/syslog-ng.pid" -# - -syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"} - -. /etc/rc.subr - -name=syslog_ng -rcvar=syslog_ng_enable - -command=%%PREFIX%%/sbin/syslog-ng -required_files=%%PREFIX%%/etc/syslog-ng.conf -extra_commands=reload - -if checkyesno syslog_ng_purgeklog; then - start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd"; -fi - -stop_postcmd=stop_postcmd - -load_rc_config $name - -: ${syslog_ng_enable:="NO"} -pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"} -command_args="-p ${pidfile} ${syslog_ng_config}" - -stop_postcmd() { - rm -f $pidfile -} - -run_rc_command "$1" diff --git a/sysutils/syslog-ng36/pkg-descr b/sysutils/syslog-ng36/pkg-descr deleted file mode 100644 index 5e0fd2927ff3..000000000000 --- a/sysutils/syslog-ng36/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -syslog-ng is an enhanced log daemon, supporting a wide range of input and -output methods: syslog, unstructured text, message queues, databases (SQL -and NoSQL alike) and more. - -Key features: - - * receive and send RFC3164 and RFC5424 style syslog messages - * work with any kind of unstructured data - * receive and send JSON formatted messages - * classify and structure logs with builtin parsers (csv-parser(), - db-parser(), ...) - * normalize, crunch and process logs as they flow through the system - * hand on messages for further processing using message queues (like - AMQP), files or databases (like PostgreSQL or MongoDB). - -The official home page of syslog-ng is: -WWW: http://www.syslog-ng.org/ diff --git a/sysutils/syslog-ng36/pkg-plist b/sysutils/syslog-ng36/pkg-plist deleted file mode 100644 index 7470109ca152..000000000000 --- a/sysutils/syslog-ng36/pkg-plist +++ /dev/null @@ -1,224 +0,0 @@ -@sample etc/scl.conf.sample -etc/syslog-ng.conf.dist -@sample etc/syslog-ng.conf.sample -bin/loggen -bin/pdbtool -bin/update-patterndb -include/syslog-ng/ack_tracker.h -include/syslog-ng/afinter.h -include/syslog-ng/alarms.h -include/syslog-ng/apphook.h -include/syslog-ng/atomic.h -include/syslog-ng/block-ref-parser.h -include/syslog-ng/bookmark.h -include/syslog-ng/cache.h -include/syslog-ng/cfg-args.h -include/syslog-ng/cfg-grammar.h -include/syslog-ng/cfg-lexer-subst.h -include/syslog-ng/cfg-lexer.h -include/syslog-ng/cfg-parser.h -include/syslog-ng/cfg-tree.h -include/syslog-ng/cfg.h -include/syslog-ng/children.h -include/syslog-ng/compat/compat.h -include/syslog-ng/compat/getutent.h -include/syslog-ng/compat/glib.h -include/syslog-ng/compat/lfs.h -include/syslog-ng/compat/pio.h -include/syslog-ng/compat/time.h -include/syslog-ng/compat/socket.h -include/syslog-ng/compat/string.h -include/syslog-ng/control/control-server.h -include/syslog-ng/control/control.h -include/syslog-ng/crypto.h -include/syslog-ng/dnscache.h -include/syslog-ng/driver.h -include/syslog-ng/file-perms.h -include/syslog-ng/filter/filter-call.h -include/syslog-ng/filter/filter-cmp.h -include/syslog-ng/filter/filter-expr-parser.h -include/syslog-ng/filter/filter-expr.h -include/syslog-ng/filter/filter-in-list.h -include/syslog-ng/filter/filter-netmask.h -include/syslog-ng/filter/filter-op.h -include/syslog-ng/filter/filter-pipe.h -include/syslog-ng/filter/filter-pri.h -include/syslog-ng/filter/filter-re.h -include/syslog-ng/filter/filter-tags.h -include/syslog-ng/gprocess.h -include/syslog-ng/gsockaddr.h -include/syslog-ng/gsocket.h -include/syslog-ng/host-resolve.h -include/syslog-ng/hostname.h -include/syslog-ng/iv.h -include/syslog-ng/iv_avl.h -include/syslog-ng/iv_event.h -include/syslog-ng/iv_event_raw.h -include/syslog-ng/iv_fd_pump.h -include/syslog-ng/iv_inotify.h -include/syslog-ng/iv_list.h -include/syslog-ng/iv_popen.h -include/syslog-ng/iv_signal.h -include/syslog-ng/iv_thread.h -include/syslog-ng/iv_tls.h -include/syslog-ng/iv_wait.h -include/syslog-ng/iv_work.h -include/syslog-ng/ivykis/iv.h -include/syslog-ng/ivykis/iv_avl.h -include/syslog-ng/ivykis/iv_event.h -include/syslog-ng/ivykis/iv_event_raw.h -include/syslog-ng/ivykis/iv_fd_pump.h -include/syslog-ng/ivykis/iv_list.h -include/syslog-ng/ivykis/iv_popen.h -include/syslog-ng/ivykis/iv_signal.h -include/syslog-ng/ivykis/iv_thread.h -include/syslog-ng/ivykis/iv_tls.h -include/syslog-ng/ivykis/iv_wait.h -include/syslog-ng/ivykis/iv_work.h -include/syslog-ng/libtest/mock-transport.h -include/syslog-ng/libtest/msg_parse_lib.h -include/syslog-ng/libtest/persist_lib.h -include/syslog-ng/libtest/proto_lib.h -include/syslog-ng/libtest/template_lib.h -include/syslog-ng/libtest/testutils.h -include/syslog-ng/logmatcher.h -include/syslog-ng/logmpx.h -include/syslog-ng/logmsg.h -include/syslog-ng/logpipe.h -include/syslog-ng/logproto/logproto-buffered-server.h -include/syslog-ng/logproto/logproto-builtins.h -include/syslog-ng/logproto/logproto-client.h -include/syslog-ng/logproto/logproto-dgram-server.h -include/syslog-ng/logproto/logproto-framed-client.h -include/syslog-ng/logproto/logproto-framed-server.h -include/syslog-ng/logproto/logproto-indented-multiline-server.h -include/syslog-ng/logproto/logproto-record-server.h -include/syslog-ng/logproto/logproto-regexp-multiline-server.h -include/syslog-ng/logproto/logproto-server.h -include/syslog-ng/logproto/logproto-text-client.h -include/syslog-ng/logproto/logproto-text-server.h -include/syslog-ng/logproto/logproto.h -include/syslog-ng/logqueue-fifo.h -include/syslog-ng/logqueue.h -include/syslog-ng/logreader.h -include/syslog-ng/logsource.h -include/syslog-ng/logstamp.h -include/syslog-ng/logthrdestdrv.h -include/syslog-ng/logwriter.h -include/syslog-ng/mainloop-call.h -include/syslog-ng/mainloop-io-worker.h -include/syslog-ng/mainloop-worker.h -include/syslog-ng/mainloop.h -include/syslog-ng/memtrace.h -include/syslog-ng/messages.h -include/syslog-ng/misc.h -include/syslog-ng/ml-batched-timer.h -include/syslog-ng/msg-format.h -include/syslog-ng/nvtable.h -include/syslog-ng/parse-number.h -include/syslog-ng/parser/parser-expr-parser.h -include/syslog-ng/parser/parser-expr.h -include/syslog-ng/pathutils.h -include/syslog-ng/persist-state.h -include/syslog-ng/persistable-state-header.h -include/syslog-ng/persistable-state-presenter.h -include/syslog-ng/plugin-types.h -include/syslog-ng/plugin.h -include/syslog-ng/poll-events.h -include/syslog-ng/poll-fd-events.h -include/syslog-ng/pragma-parser.h -include/syslog-ng/presented-persistable-state.h -include/syslog-ng/rcptid.h -include/syslog-ng/reloc.h -include/syslog-ng/rewrite/rewrite-expr-parser.h -include/syslog-ng/rewrite/rewrite-expr.h -include/syslog-ng/rewrite/rewrite-groupset.h -include/syslog-ng/rewrite/rewrite-set-tag.h -include/syslog-ng/rewrite/rewrite-set.h -include/syslog-ng/rewrite/rewrite-subst.h -include/syslog-ng/ringbuffer.h -include/syslog-ng/run-id.h -include/syslog-ng/scratch-buffers.h -include/syslog-ng/serialize.h -include/syslog-ng/service-management.h -include/syslog-ng/stats/stats-cluster.h -include/syslog-ng/stats/stats-counter.h -include/syslog-ng/stats/stats-csv.h -include/syslog-ng/stats/stats-log.h -include/syslog-ng/stats/stats-registry.h -include/syslog-ng/stats/stats-syslog.h -include/syslog-ng/stats/stats.h -include/syslog-ng/str-format.h -include/syslog-ng/syslog-names.h -include/syslog-ng/syslog-ng.h -include/syslog-ng/tags.h -include/syslog-ng/template/templates.h -include/syslog-ng/thread-utils.h -include/syslog-ng/timeutils.h -include/syslog-ng/tls-support.h -include/syslog-ng/tlscontext.h -include/syslog-ng/transport/logtransport.h -include/syslog-ng/transport/transport-aux-data.h -include/syslog-ng/transport/transport-device.h -include/syslog-ng/transport/transport-file.h -include/syslog-ng/transport/transport-pipe.h -include/syslog-ng/transport/transport-socket.h -include/syslog-ng/transport/transport-tls.h -include/syslog-ng/type-hinting.h -include/syslog-ng/uuid.h -include/syslog-ng/value-pairs.h -include/syslog-ng/versioning.h -include/syslog-ng/vptransform.h -lib/libsyslog-ng-3.6.so.0.0.0 -lib/libsyslog-ng.so -lib/libsyslog-ng-3.6.so.0 -lib/syslog-ng/libafamqp.so -lib/syslog-ng/libaffile.so -lib/syslog-ng/libafmongodb.so -lib/syslog-ng/libafprog.so -lib/syslog-ng/libafsocket-notls.so -lib/syslog-ng/libafsocket.so -lib/syslog-ng/libafstomp.so -lib/syslog-ng/libafuser.so -lib/syslog-ng/libbasicfuncs.so -lib/syslog-ng/libconfgen.so -lib/syslog-ng/libcryptofuncs.so -lib/syslog-ng/libcsvparser.so -lib/syslog-ng/libdbparser.so -lib/syslog-ng/libgraphite.so -lib/syslog-ng/liblinux-kmsg-format.so -lib/syslog-ng/libpseudofile.so -lib/syslog-ng/libsyslog-ng-crypto.so -lib/syslog-ng/libsyslogformat.so -lib/syslog-ng/libsystem-source.so -lib/syslog-ng/libtest/libsyslog-ng-test.a -libdata/pkgconfig/syslog-ng.pc -libdata/pkgconfig/syslog-ng-test.pc -man/man1/loggen.1.gz -man/man1/pdbtool.1.gz -man/man1/syslog-ng-ctl.1.gz -man/man5/syslog-ng.conf.5.gz -man/man8/syslog-ng.8.gz -sbin/syslog-ng -sbin/syslog-ng-ctl -share/syslog-ng/include/scl/graphite/plugin.conf -share/syslog-ng/include/scl/graphite/README -share/syslog-ng/include/scl/nodejs/plugin.conf -share/syslog-ng/include/scl/pacct/plugin.conf -share/syslog-ng/include/scl/syslogconf/README -share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk -share/syslog-ng/include/scl/syslogconf/plugin.conf -share/syslog-ng/include/scl/system/plugin.conf -share/syslog-ng/include/scl/rewrite/cc-mask.conf -share/syslog-ng/tools/cfg-grammar.y -share/syslog-ng/tools/lex-rules.am -share/syslog-ng/tools/merge-grammar.pl -share/syslog-ng/tools/system-expand -share/syslog-ng/xsd/patterndb-1.xsd -share/syslog-ng/xsd/patterndb-2.xsd -share/syslog-ng/xsd/patterndb-3.xsd -share/syslog-ng/xsd/patterndb-4.xsd -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS.md -@dir etc/patterndb.d diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile deleted file mode 100644 index 5d8d140ba234..000000000000 --- a/sysutils/syslog-ng37/Makefile +++ /dev/null @@ -1,152 +0,0 @@ -# Created by: Ivan Lago <ivan.lago@ifom-ieo-campus.it> -# $FreeBSD$ - -PORTNAME= syslog-ng -PORTVERSION= 3.7.3 -PORTREVISION= 12 -CATEGORIES= sysutils -#MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ -DISTNAME= syslog-ng-${DISTVERSION}_with_man -MASTER_SITES= http://peter.czanik.hu/freebsd/ - -.if !defined(MASTERDIR) -PKGNAMESUFFIX= 37 -.endif - -MAINTAINER= cy@FreeBSD.org -COMMENT= Powerful syslogd replacement - -LIB_DEPENDS= libevtlog.so:sysutils/eventlog \ - libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid -BUILD_DEPENDS= xsltproc:textproc/libxslt - -DEPRECATED= No longer officially supported by Balabit, does not support openssl111 -EXPIRATION_DATE= 2018-12-31 -BROKEN_sparc64= fails to link: Internal error: Segmentation fault (program ld) - -CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ - syslog-ng[0-9][0-9]-[0-9]* \ - syslog-ng[0-9][0-9][0-9]-[0-9]* \ - syslog-ng-devel-[0-9]* \ - syslog-ng-incubator-* - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - -MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON MONGO -OPTIONS_DEFAULT= JSON -TCP_WRAPPERS_DESC= Build with TCP Wrappers -SQL_DESC= Build with database (libdbi) support -SPOOF_DESC= Build with spoof source support -SMTP_DESC= Build with SMTP support -JSON_DESC= Build with JSON-C support -GEOIP_DESC= Build with GeoIP support -REDIS_DESC= Build with Redis support -JAVA_DESC= Build with Java support (and modules, like Elastic) -PYTHON_DESC= Build with Python 2.7 support - -USES= gmake libtool pathfix pkgconfig ssl gettext-runtime -USE_LDCONFIG= yes -USE_RC_SUBR= syslog-ng -GNU_CONFIGURE= yes -USE_GNOME= glib20 -SUB_FILES= pkg-message -INSTALL_TARGET= install-strip - -CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ - --enable-dynamic-linking --enable-manpages \ - --disable-linux-caps \ - --datadir=${PREFIX}/share/syslog-ng/ - -CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" - -TCP_WRAPPERS_CONFIGURE_ENABLE= tcp-wrapper - -SPOOF_CONFIGURE_ENABLE= spoof-source -SPOOF_LIB_DEPENDS= libnet.so:net/libnet - -IPV6_CONFIGURE_ENABLE= ipv6 - -GEOIP_CONFIGURE_ENABLE= geoip -GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP -GEOIP_CONFIGURE_ENV= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" -GEOIP_PLIST_FILES= lib/syslog-ng/libgeoip-plugin.so - -REDIS_CONFIGURE_ENABLE= redis -REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis -REDIS_PLIST_FILES= lib/syslog-ng/libredis.so - -SMTP_CONFIGURE_ON= --with-libesmtp=/usr/local/ -SMTP_CONFIGURE_OFF= --disable-smtp -SMTP_LIB_DEPENDS= libesmtp.so:mail/libesmtp -SMTP_PLIST_FILES= lib/syslog-ng/libafsmtp.so - -SQL_CONFIGURE_ENABLE= sql -SQL_LIB_DEPENDS= libdbi.so:databases/libdbi -SQL_CONFIGURE_ENV= LIBDBI_LIBS="-ldbi" -SQL_LDFLAGS= -L${LOCALBASE}/lib -SQL_PLIST_FILES= lib/syslog-ng/libafsql.so - -MONGO_CONFIGURE_ENABLE= mongodb -MONGO_BUILD_DEPENDS= mongo:databases/mongodb34 -MONGO_RUN_DEPENDS= mongo:databases/mongodb34 -MONGO_PLIST_FILES= lib/syslog-ng/libafmongodb.so - -JSON_CONFIGURE_ENABLE= json -JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -JSON_PLIST_FILES= lib/syslog-ng/libjson-plugin.so - -JAVA_CONFIGURE_ENABLE= java -JAVA_BROKEN= Unsupported maven downloads. -JAVA_USE= JAVA=yes -JAVA_BUILD_DEPENDS= gradle:devel/gradle -JAVA_BUILD_DEPENDS= bash:shells/bash -JAVA_PLIST_FILES= lib/syslog-ng/libmod-java.so \ - lib/syslog-ng/java-modules/syslog-ng-core.jar \ - lib/syslog-ng/java-modules/log4j-1.2.16.jar \ - lib/syslog-ng/java-modules/elastic.jar \ - lib/syslog-ng/java-modules/http.jar \ - lib/syslog-ng/java-modules/kafka.jar \ - lib/syslog-ng/java-modules/java-modules.jar \ - lib/syslog-ng/java-modules/hdfs.jar \ - lib/syslog-ng/java-modules/syslog-ng-common.jar \ - lib/syslog-ng/java-modules/dummy.jar - -PYTHON_CONFIGURE_ON= --enable-python --with-python=2.7 -PYTHON_CONFIGURE_OFF= --disable-python -PYTHON_USES= python:2.7 -PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so - -.include <bsd.port.pre.mk> - -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 -.if ${SSL_DEFAULT} != "openssl" -BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl -BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl -.endif -.endif - -post-patch: - @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist - @${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR} -.endif - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \ - ${STAGEDIR}${PREFIX}/etc - ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \ - ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc - ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ - ${STAGEDIR}${PREFIX}/include/syslog-ng/ - -.include <bsd.port.post.mk> diff --git a/sysutils/syslog-ng37/distinfo b/sysutils/syslog-ng37/distinfo deleted file mode 100644 index 9aee6947971f..000000000000 --- a/sysutils/syslog-ng37/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1464621619 -SHA256 (syslog-ng-3.7.3_with_man.tar.gz) = bd991765f9f57d35eaa5a909475cbba22fd7a25bc3ea8a210e4b7a8988389f8c -SIZE (syslog-ng-3.7.3_with_man.tar.gz) = 3561113 diff --git a/sysutils/syslog-ng37/files/patch-configure b/sysutils/syslog-ng37/files/patch-configure deleted file mode 100644 index 76dba389a906..000000000000 --- a/sysutils/syslog-ng37/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.orig 2016-04-01 01:45:11.000000000 -0700 -+++ configure 2016-08-09 20:35:26.657622000 -0700 -@@ -15049,9 +15049,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNET" >&5 - $as_echo_n "checking for LIBNET... " >&6; } - if test "x$with_libnet" = "x"; then -- LIBNET_CONFIG="`which libnet-config`" -+ LIBNET_CONFIG="`which libnet11-config`" - else -- LIBNET_CONFIG="$with_libnet/libnet-config" -+ LIBNET_CONFIG="$with_libnet/libnet11-config" - fi - - if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -@@ -16086,7 +16086,7 @@ - - if test "$VERSION_OK" = "1"; - then -- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"` -+ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` - JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1` - JNI_LIBS="-L$JNI_LIBDIR -ljvm" - JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" | sed "s/\(.*\)jni.h/\1/" | head -n 1` -@@ -16187,7 +16187,7 @@ - - if test "$VERSION_OK" = "1"; - then -- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"` -+ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` - JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1` - JNI_LIBS="-L$JNI_LIBDIR -ljvm" - JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" | sed "s/\(.*\)jni.h/\1/" | head -n 1` diff --git a/sysutils/syslog-ng37/files/pkg-message.in b/sysutils/syslog-ng37/files/pkg-message.in deleted file mode 100644 index 36cb7e65a243..000000000000 --- a/sysutils/syslog-ng37/files/pkg-message.in +++ /dev/null @@ -1,29 +0,0 @@ - -syslog-ng is now installed! To replace FreeBSD's standard syslogd -(/usr/sbin/syslogd), complete these steps: - -1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf - (a sample named syslog-ng.conf.sample has been included in - %%PREFIX%%/etc). Note that this is a change in 2.0.2 - version, previous ones put the config file in - %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update - move that file in the right place - -2. Configure syslog-ng to start automatically by adding the following - to /etc/rc.conf: - - syslog_ng_enable="YES" - -3. Prevent the standard FreeBSD syslogd from starting automatically by - adding a line to the end of your /etc/rc.conf file that reads: - - syslogd_enable="NO" - -4. Shut down the standard FreeBSD syslogd: - - kill `cat /var/run/syslog.pid` - -5. Start syslog-ng: - - %%PREFIX%%/etc/rc.d/syslog-ng start - diff --git a/sysutils/syslog-ng37/files/syslog-ng.conf.sample b/sysutils/syslog-ng37/files/syslog-ng.conf.sample deleted file mode 100644 index 337677ed652b..000000000000 --- a/sysutils/syslog-ng37/files/syslog-ng.conf.sample +++ /dev/null @@ -1,185 +0,0 @@ -@version:3.7 -@include "scl.conf" - -# -# This sample configuration file is essentially equilivent to the stock -# FreeBSD /etc/syslog.conf file. -# -# $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.conf.sample 340872 2014-01-24 00:14:07Z mat $ -# - -# -# options -# -options { chain_hostnames(off); flush_lines(0); threaded(yes); }; - -# -# sources -# -source src { system(); - udp(); internal(); }; - -# -# destinations -# -destination messages { file("/var/log/messages"); }; -destination security { file("/var/log/security"); }; -destination authlog { file("/var/log/auth.log"); }; -destination maillog { file("/var/log/maillog"); }; -destination lpd-errs { file("/var/log/lpd-errs"); }; -destination xferlog { file("/var/log/xferlog"); }; -destination cron { file("/var/log/cron"); }; -destination debuglog { file("/var/log/debug.log"); }; -destination consolelog { file("/var/log/console.log"); }; -destination all { file("/var/log/all.log"); }; -destination newscrit { file("/var/log/news/news.crit"); }; -destination newserr { file("/var/log/news/news.err"); }; -destination newsnotice { file("/var/log/news/news.notice"); }; -destination slip { file("/var/log/slip.log"); }; -destination ppp { file("/var/log/ppp.log"); }; -destination console { file("/dev/console"); }; -destination allusers { usertty("*"); }; -#destination loghost { udp("loghost" port(514)); }; - -# -# log facility filters -# -filter f_auth { facility(auth); }; -filter f_authpriv { facility(authpriv); }; -filter f_not_authpriv { not facility(authpriv); }; -#filter f_console { facility(console); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_ftp { facility(ftp); }; -filter f_kern { facility(kern); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_news { facility(news); }; -filter f_security { facility(security); }; -filter f_user { facility(user); }; -filter f_uucp { facility(uucp); }; -filter f_local0 { facility(local0); }; -filter f_local1 { facility(local1); }; -filter f_local2 { facility(local2); }; -filter f_local3 { facility(local3); }; -filter f_local4 { facility(local4); }; -filter f_local5 { facility(local5); }; -filter f_local6 { facility(local6); }; -filter f_local7 { facility(local7); }; - -# -# log level filters -# -filter f_emerg { level(emerg); }; -filter f_alert { level(alert..emerg); }; -filter f_crit { level(crit..emerg); }; -filter f_err { level(err..emerg); }; -filter f_warning { level(warning..emerg); }; -filter f_notice { level(notice..emerg); }; -filter f_info { level(info..emerg); }; -filter f_debug { level(debug..emerg); }; -filter f_is_debug { level(debug); }; - -# -# program filters -# -filter f_ppp { program("ppp"); }; -filter f_slip { program("startslip"); }; - -# -# *.err;kern.warning;auth.notice;mail.crit /dev/console -# -log { source(src); filter(f_err); destination(console); }; -log { source(src); filter(f_kern); filter(f_warning); destination(console); }; -log { source(src); filter(f_auth); filter(f_notice); destination(console); }; -log { source(src); filter(f_mail); filter(f_crit); destination(console); }; - -# -# *.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages -# -log { source(src); filter(f_notice); filter(f_not_authpriv); destination(messages); }; -log { source(src); filter(f_kern); filter(f_debug); destination(messages); }; -log { source(src); filter(f_lpr); filter(f_info); destination(messages); }; -log { source(src); filter(f_mail); filter(f_crit); destination(messages); }; -log { source(src); filter(f_news); filter(f_err); destination(messages); }; - -# -# security.* /var/log/security -# -log { source(src); filter(f_security); destination(security); }; - -# -# auth.info;authpriv.info /var/log/auth.log -log { source(src); filter(f_auth); filter(f_info); destination(authlog); }; -log { source(src); filter(f_authpriv); filter(f_info); destination(authlog); }; - -# -# mail.info /var/log/maillog -# -log { source(src); filter(f_mail); filter(f_info); destination(maillog); }; - -# -# lpr.info /var/log/lpd-errs -# -log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); }; - -# -# ftp.info /var/log/xferlog -# -log { source(src); filter(f_ftp); filter(f_info); destination(xferlog); }; - -# -# cron.* /var/log/cron -# -log { source(src); filter(f_cron); destination(cron); }; - -# -# *.=debug /var/log/debug.log -# -log { source(src); filter(f_is_debug); destination(debuglog); }; - -# -# *.emerg * -# -log { source(src); filter(f_emerg); destination(allusers); }; - -# -# uncomment this to log all writes to /dev/console to /var/log/console.log -# console.info /var/log/console.log -# -#log { source(src); filter(f_console); filter(f_info); destination(consolelog); }; - -# -# uncomment this to enable logging of all log messages to /var/log/all.log -# touch /var/log/all.log and chmod it to mode 600 before it will work -# *.* /var/log/all.log -# -#log { source(src); destination(all); }; - -# -# uncomment this to enable logging to a remote loghost named loghost -# *.* @loghost -# -#log { source(src); destination(loghost); }; - -# -# uncomment these if you're running inn -# news.crit /var/log/news/news.crit -# news.err /var/log/news/news.err -# news.notice /var/log/news/news.notice -# -#log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; -#log { source(src); filter(f_news); filter(f_err); destination(newserr); }; -#log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; - -# -# !startslip -# *.* /var/log/slip.log -# -log { source(src); filter(f_slip); destination(slip); }; - -# -# !ppp -# *.* /var/log/ppp.log -# -log { source(src); filter(f_ppp); destination(ppp); }; diff --git a/sysutils/syslog-ng37/files/syslog-ng.in b/sysutils/syslog-ng37/files/syslog-ng.in deleted file mode 100644 index ae24e4984375..000000000000 --- a/sysutils/syslog-ng37/files/syslog-ng.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.in 340872 2014-01-24 00:14:07Z mat $ -# - -# PROVIDE: syslogd -# REQUIRE: mountcritremote cleanvar ldconfig -# BEFORE: SERVERS - -# -# Add the following line to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -#syslog_ng_enable="YES" -#syslog_ng_config="-u daemon" -#syslog_ng_pid="/var/run/syslog-ng.pid" -# - -syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"} - -. /etc/rc.subr - -name=syslog_ng -rcvar=syslog_ng_enable - -command=%%PREFIX%%/sbin/syslog-ng -required_files=%%PREFIX%%/etc/syslog-ng.conf -extra_commands=reload - -if checkyesno syslog_ng_purgeklog; then - start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd"; -fi - -stop_postcmd=stop_postcmd - -load_rc_config $name - -: ${syslog_ng_enable:="NO"} -pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"} -command_args="-p ${pidfile} ${syslog_ng_config}" - -stop_postcmd() { - rm -f $pidfile -} - -run_rc_command "$1" diff --git a/sysutils/syslog-ng37/pkg-descr b/sysutils/syslog-ng37/pkg-descr deleted file mode 100644 index 5e0fd2927ff3..000000000000 --- a/sysutils/syslog-ng37/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -syslog-ng is an enhanced log daemon, supporting a wide range of input and -output methods: syslog, unstructured text, message queues, databases (SQL -and NoSQL alike) and more. - -Key features: - - * receive and send RFC3164 and RFC5424 style syslog messages - * work with any kind of unstructured data - * receive and send JSON formatted messages - * classify and structure logs with builtin parsers (csv-parser(), - db-parser(), ...) - * normalize, crunch and process logs as they flow through the system - * hand on messages for further processing using message queues (like - AMQP), files or databases (like PostgreSQL or MongoDB). - -The official home page of syslog-ng is: -WWW: http://www.syslog-ng.org/ diff --git a/sysutils/syslog-ng37/pkg-plist b/sysutils/syslog-ng37/pkg-plist deleted file mode 100644 index 8a2c68cebe35..000000000000 --- a/sysutils/syslog-ng37/pkg-plist +++ /dev/null @@ -1,244 +0,0 @@ -@sample etc/scl.conf.sample -etc/syslog-ng.conf.dist -@sample etc/syslog-ng.conf.sample -bin/pdbtool -bin/loggen -bin/update-patterndb -include/syslog-ng/ivykis/iv_avl.h -include/syslog-ng/ivykis/iv_event.h -include/syslog-ng/ivykis/iv_event_raw.h -include/syslog-ng/ivykis/iv_list.h -include/syslog-ng/ivykis/iv_thread.h -include/syslog-ng/ivykis/iv_tls.h -include/syslog-ng/ivykis/iv_work.h -include/syslog-ng/ivykis/iv_fd_pump.h -include/syslog-ng/ivykis/iv_popen.h -include/syslog-ng/ivykis/iv_signal.h -include/syslog-ng/ivykis/iv_wait.h -include/syslog-ng/ivykis/iv.h -include/syslog-ng/compat/compat.h -include/syslog-ng/compat/getutent.h -include/syslog-ng/compat/glib.h -include/syslog-ng/compat/lfs.h -include/syslog-ng/compat/pio.h -include/syslog-ng/compat/socket.h -include/syslog-ng/compat/string.h -include/syslog-ng/compat/time.h -include/syslog-ng/control/control.h -include/syslog-ng/control/control-server.h -include/syslog-ng/debugger/debugger.h -include/syslog-ng/debugger/tracer.h -include/syslog-ng/debugger/debugger-main.h -include/syslog-ng/filter/filter-expr.h -include/syslog-ng/filter/filter-op.h -include/syslog-ng/filter/filter-cmp.h -include/syslog-ng/filter/filter-in-list.h -include/syslog-ng/filter/filter-tags.h -include/syslog-ng/filter/filter-netmask.h -include/syslog-ng/filter/filter-netmask6.h -include/syslog-ng/filter/filter-call.h -include/syslog-ng/filter/filter-re.h -include/syslog-ng/filter/filter-pri.h -include/syslog-ng/filter/filter-pipe.h -include/syslog-ng/filter/filter-expr-parser.h -include/syslog-ng/libtest/testutils.h -include/syslog-ng/libtest/msg_parse_lib.h -include/syslog-ng/libtest/template_lib.h -include/syslog-ng/libtest/proto_lib.h -include/syslog-ng/libtest/persist_lib.h -include/syslog-ng/libtest/mock-transport.h -include/syslog-ng/logproto/logproto-client.h -include/syslog-ng/logproto/logproto-server.h -include/syslog-ng/logproto/logproto-buffered-server.h -include/syslog-ng/logproto/logproto-dgram-server.h -include/syslog-ng/logproto/logproto-framed-client.h -include/syslog-ng/logproto/logproto-framed-server.h -include/syslog-ng/logproto/logproto-text-client.h -include/syslog-ng/logproto/logproto-text-server.h -include/syslog-ng/logproto/logproto-indented-multiline-server.h -include/syslog-ng/logproto/logproto-regexp-multiline-server.h -include/syslog-ng/logproto/logproto-record-server.h -include/syslog-ng/logproto/logproto-builtins.h -include/syslog-ng/logproto/logproto.h -include/syslog-ng/parser/parser-expr.h -include/syslog-ng/parser/parser-expr-parser.h -include/syslog-ng/afinter.h -include/syslog-ng/alarms.h -include/syslog-ng/apphook.h -include/syslog-ng/atomic.h -include/syslog-ng/block-ref-parser.h -include/syslog-ng/cache.h -include/syslog-ng/cfg.h -include/syslog-ng/cfg-grammar.h -include/syslog-ng/cfg-lexer.h -include/syslog-ng/cfg-lexer-subst.h -include/syslog-ng/cfg-args.h -include/syslog-ng/cfg-parser.h -include/syslog-ng/cfg-tree.h -include/syslog-ng/children.h -include/syslog-ng/crypto.h -include/syslog-ng/dnscache.h -include/syslog-ng/misc.h -include/syslog-ng/driver.h -include/syslog-ng/file-perms.h -include/syslog-ng/gprocess.h -include/syslog-ng/gsockaddr.h -include/syslog-ng/gsocket.h -include/syslog-ng/hostname.h -include/syslog-ng/host-resolve.h -include/syslog-ng/logmatcher.h -include/syslog-ng/logmpx.h -include/syslog-ng/logmsg.h -include/syslog-ng/logpipe.h -include/syslog-ng/logqueue-fifo.h -include/syslog-ng/logqueue.h -include/syslog-ng/logreader.h -include/syslog-ng/logsource.h -include/syslog-ng/logstamp.h -include/syslog-ng/logthrdestdrv.h -include/syslog-ng/logwriter.h -include/syslog-ng/mainloop.h -include/syslog-ng/mainloop-call.h -include/syslog-ng/mainloop-worker.h -include/syslog-ng/mainloop-io-worker.h -include/syslog-ng/module-config.h -include/syslog-ng/memtrace.h -include/syslog-ng/messages.h -include/syslog-ng/ml-batched-timer.h -include/syslog-ng/msg-format.h -include/syslog-ng/nvtable.h -include/syslog-ng/parse-number.h -include/syslog-ng/pathutils.h -include/syslog-ng/persist-state.h -include/syslog-ng/persistable-state-header.h -include/syslog-ng/persistable-state-presenter.h -include/syslog-ng/plugin.h -include/syslog-ng/plugin-types.h -include/syslog-ng/poll-events.h -include/syslog-ng/poll-fd-events.h -include/syslog-ng/pragma-parser.h -include/syslog-ng/presented-persistable-state.h -include/syslog-ng/reloc.h -include/syslog-ng/rcptid.h -include/syslog-ng/run-id.h -include/syslog-ng/scratch-buffers.h -include/syslog-ng/serialize.h -include/syslog-ng/service-management.h -include/syslog-ng/stringutils.h -include/syslog-ng/str-format.h -include/syslog-ng/syslog-names.h -include/syslog-ng/syslog-ng.h -include/syslog-ng/tags.h -include/syslog-ng/timeutils.h -include/syslog-ng/tls-support.h -include/syslog-ng/thread-utils.h -include/syslog-ng/tlscontext.h -include/syslog-ng/type-hinting.h -include/syslog-ng/uuid.h -include/syslog-ng/utf8utils.h -include/syslog-ng/value-pairs.h -include/syslog-ng/vptransform.h -include/syslog-ng/versioning.h -include/syslog-ng/bookmark.h -include/syslog-ng/ringbuffer.h -include/syslog-ng/ack_tracker.h -include/syslog-ng/host-id.h -include/syslog-ng/rewrite/rewrite-expr.h -include/syslog-ng/rewrite/rewrite-set-tag.h -include/syslog-ng/rewrite/rewrite-set.h -include/syslog-ng/rewrite/rewrite-subst.h -include/syslog-ng/rewrite/rewrite-expr-parser.h -include/syslog-ng/rewrite/rewrite-groupset.h -include/syslog-ng/stats/stats.h -include/syslog-ng/stats/stats-counter.h -include/syslog-ng/stats/stats-cluster.h -include/syslog-ng/stats/stats-csv.h -include/syslog-ng/stats/stats-log.h -include/syslog-ng/stats/stats-registry.h -include/syslog-ng/stats/stats-syslog.h -include/syslog-ng/template/templates.h -include/syslog-ng/template/macros.h -include/syslog-ng/template/function.h -include/syslog-ng/template/simple-function.h -include/syslog-ng/template/repr.h -include/syslog-ng/template/compiler.h -include/syslog-ng/template/user-function.h -include/syslog-ng/template/escaping.h -include/syslog-ng/template/common-template-typedefs.h -include/syslog-ng/transport/logtransport.h -include/syslog-ng/transport/transport-aux-data.h -include/syslog-ng/transport/transport-tls.h -include/syslog-ng/transport/transport-file.h -include/syslog-ng/transport/transport-pipe.h -include/syslog-ng/transport/transport-device.h -include/syslog-ng/transport/transport-socket.h -include/syslog-ng/iv.h -include/syslog-ng/iv_avl.h -include/syslog-ng/iv_event.h -include/syslog-ng/iv_event_raw.h -include/syslog-ng/iv_fd_pump.h -include/syslog-ng/iv_inotify.h -include/syslog-ng/iv_list.h -include/syslog-ng/iv_popen.h -include/syslog-ng/iv_signal.h -include/syslog-ng/iv_thread.h -include/syslog-ng/iv_tls.h -include/syslog-ng/iv_wait.h -include/syslog-ng/iv_work.h -lib/libsyslog-ng-3.7.so.0.0.0 -lib/libsyslog-ng-3.7.so.0 -lib/libsyslog-ng.so -lib/syslog-ng/libtest/libsyslog-ng-test.a -lib/syslog-ng/libsyslogformat.so -lib/syslog-ng/libafsocket.so -lib/syslog-ng/libaffile.so -lib/syslog-ng/libafprog.so -lib/syslog-ng/libafuser.so -lib/syslog-ng/libafamqp.so -lib/syslog-ng/libcsvparser.so -lib/syslog-ng/libconfgen.so -lib/syslog-ng/libsystem-source.so -lib/syslog-ng/liblinux-kmsg-format.so -lib/syslog-ng/libbasicfuncs.so -lib/syslog-ng/libcryptofuncs.so -lib/syslog-ng/libdbparser.so -lib/syslog-ng/libafstomp.so -lib/syslog-ng/libpseudofile.so -lib/syslog-ng/libgraphite.so -lib/syslog-ng/libkvformat.so -libdata/pkgconfig/syslog-ng.pc -libdata/pkgconfig/syslog-ng-test.pc -man/man1/loggen.1.gz -man/man1/pdbtool.1.gz -man/man1/syslog-ng-ctl.1.gz -man/man5/syslog-ng.conf.5.gz -man/man8/syslog-ng.8.gz -sbin/syslog-ng -sbin/syslog-ng-ctl -share/syslog-ng/include/scl/system/plugin.conf -share/syslog-ng/include/scl/pacct/plugin.conf -share/syslog-ng/include/scl/syslogconf/plugin.conf -share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk -share/syslog-ng/include/scl/syslogconf/README -share/syslog-ng/include/scl/rewrite/cc-mask.conf -share/syslog-ng/include/scl/nodejs/plugin.conf -share/syslog-ng/include/scl/graphite/plugin.conf -share/syslog-ng/include/scl/graphite/README -share/syslog-ng/include/scl/cim/template.conf -share/syslog-ng/include/scl/solaris/plugin.conf -share/syslog-ng/include/scl/elasticsearch/plugin.conf -share/syslog-ng/include/scl/hdfs/plugin.conf -share/syslog-ng/include/scl/kafka/plugin.conf -share/syslog-ng/include/scl/mbox/mbox.conf -share/syslog-ng/tools/lex-rules.am -share/syslog-ng/tools/cfg-grammar.y -share/syslog-ng/tools/merge-grammar.pl -share/syslog-ng/tools/system-expand -share/syslog-ng/xsd/patterndb-1.xsd -share/syslog-ng/xsd/patterndb-2.xsd -share/syslog-ng/xsd/patterndb-3.xsd -share/syslog-ng/xsd/patterndb-4.xsd -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS.md -@dir etc/patterndb.d diff --git a/www/Makefile b/www/Makefile index 8e9e0ea76442..c39828711590 100644 --- a/www/Makefile +++ b/www/Makefile @@ -482,7 +482,6 @@ SUBDIR += mongoose SUBDIR += mongrel2 SUBDIR += moodle31 - SUBDIR += moodle33 SUBDIR += moodle34 SUBDIR += moodle35 SUBDIR += moodle36 @@ -2235,7 +2234,6 @@ SUBDIR += sogo4 SUBDIR += sogo4-activesync SUBDIR += spawn-fcgi - SUBDIR += spdylay SUBDIR += spreadlogd SUBDIR += sqstat SUBDIR += squid diff --git a/www/moodle33/Makefile b/www/moodle33/Makefile deleted file mode 100644 index 5d8132c3b404..000000000000 --- a/www/moodle33/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# Created by: Javier Martin Rueda <jmrueda@diatel.upm.es> -# $FreeBSD$ - -PORTNAME= moodle -PORTVERSION= 3.3.9 -CATEGORIES= www -MASTER_SITES= SF/moodle/Moodle/stable33/ -PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} - -MAINTAINER= wen@FreeBSD.org -COMMENT= Course management system based on social constructionism - -LICENSE= GPLv3 - -DEPRECATED= Upstream no longer maintained -EXPIRATION_DATE=2018-12-31 - -CONFLICTS= moodle31-3.1.[0-9]* moodle34-3.4.[0-9]* moodle35-3.5.[0-9]* \ - moodle36-3.6.[0-9]* - -USES= cpe php tar:tgz -USE_PHP= ctype curl dom fileinfo gd hash iconv intl json mbstring \ - opcache openssl pcre session simplexml soap spl tokenizer \ - xml xmlreader xmlrpc zip zlib -WRKSRC= ${WRKDIR}/moodle - -OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= MYSQL PGSQL MSSQL -OPTIONS_DEFINE= LDAP MIMETEX -OPTIONS_DEFAULT= MYSQL -MIMETEX_DESC= mimeTeX filter functionality support - -MYSQL_USES= mysql -MYSQL_USE= php=mysqli -PGSQL_USE= php=pgsql -MSSQL_USE= php=mssql -LDAP_USE= php=ldap -MIMETEX_RUN_DEPENDS= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:www/mimetex - -NO_BUILD= yes -PLIST= ${WRKDIR}/plist -SUB_FILES= pkg-message -SUB_LIST= MOODLEDIR=${MOODLEDIR} \ - MOODLEDATADIR=${MOODLEDATADIR} - -MOODLEDIR?= www/moodle -MOODLEDATADIR?= moodledata - -pre-install: - @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} - @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} - @${ECHO_CMD} "@mode 755" >> ${PLIST} - @${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST} - @${ECHO_CMD} "@mode" >> ${PLIST} - @${ECHO_CMD} "@group" >> ${PLIST} - @${ECHO_CMD} "@owner" >> ${PLIST} - -# Here for safety I do not set moodle diretory 0755 permission -# It require user write config.php manually then. - @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST} - @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST} - -do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR} - @${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR} - -do-install-MIMETEX-on: - ${LN} -sf ${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi \ - ${STAGEDIR}${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd - -.include <bsd.port.mk> diff --git a/www/moodle33/distinfo b/www/moodle33/distinfo deleted file mode 100644 index 449d353f3153..000000000000 --- a/www/moodle33/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1542014052 -SHA256 (moodle-3.3.9.tgz) = 4c929194042070bba91a4ab3133e34b12df377e076af7eb444ccf2386245a5bd -SIZE (moodle-3.3.9.tgz) = 45123816 diff --git a/www/moodle33/files/pkg-message.in b/www/moodle33/files/pkg-message.in deleted file mode 100644 index 51d88dbabde0..000000000000 --- a/www/moodle33/files/pkg-message.in +++ /dev/null @@ -1,53 +0,0 @@ -POST-INSTALL CONFIGURATION FOR MOODLE -===================================== - -1) Create a user and a database for Moodle to store all - its tables in (or choose an existing database). - It doesn't matter what the database or user names are, - as this will be configured in a later step. - NOTE: this package assumes that either the phpX-pgsql, - phpX-mysql, or phpX-mssql packages are installed. - -2) Add the following to your Apache configuration file - httpd.conf, and restart the server: - - Alias /moodle %%PREFIX%%/%%MOODLEDIR%%/ - AcceptPathInfo On - <Directory %%PREFIX%%/%%MOODLEDIR%%/> - AllowOverride None - Require all granted - </Directory> - -3) Visit your Moodle site with a browser (i.e., - http://your.server.com/moodle/), and you should - be taken to the install.php script, which will lead - you through creating a config.php file and then - setting up Moodle, creating an admin account, etc. - - At one step, you will get a message saying that the - installer script was not able to automatically create - the config.php file. Just download it and copy it to - %%PREFIX%%/%%MOODLEDIR%%/config.php. Beware that it - will contain the database password in cleartext, so - set up whatever file permissions you deem more adequate. - For instance, user=root, group=www, mask=640. - -4) Set up a cron task to invoke the file admin/cron.php - every five minutes or so. For instance: - */5 * * * * fetch http://your.server.com/moodle/admin/cron.php - -For more information, see the INSTALL DOCUMENTATION: - - http://docs.moodle.org/en/Installing_Moodle - -It may be worth reading the installation docs even if Moodle seems -to be working at first, to ensure your PHP settings and database -configuration will allow Moodle to operate properly. - -If you are upgrading from an earlier version of Moodle, check out -possible additional steps at: - - https://docs.moodle.org/30/en/Upgrading - -If you have real trouble, please visit the Moodle course -"Using Moodle" on moodle.org. diff --git a/www/moodle33/pkg-descr b/www/moodle33/pkg-descr deleted file mode 100644 index fe30e0d25bab..000000000000 --- a/www/moodle33/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Moodle is a course management system (CMS) - a free, Open Source software -package designed using sound pedagogical principles, to help educators -create effective online learning communities. You can use it on any -computer you have handy (including webhosts), yet it can scale from a -single-teacher site to a 40,000-student University. - -WWW: http://www.moodle.org/ diff --git a/www/spdylay/Makefile b/www/spdylay/Makefile deleted file mode 100644 index 78e7e4df09bb..000000000000 --- a/www/spdylay/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= spdylay -PORTVERSION= 1.4.0 -PORTREVISION= 7 -CATEGORIES= www net -MASTER_SITES= https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \ - LOCAL/sunpoet - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= SPDY protocol version 2, 3 and 3.1 implementation in C - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN_powerpc64= does not link: undefined reference to 'std::ctype<char>::_M_widen_init()' -BROKEN_sparc64= does not build: fails to link -DEPRECATED= SPDY is deprecated, use HTTP/2 instead -EXPIRATION_DATE=2018-12-31 - -BUILD_DEPENDS= libevent>=2.0.8:devel/libevent -LIB_DEPENDS= libevent_openssl.so:devel/libevent - -CONFIGURE_ARGS= --enable-examples \ - --enable-src -CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_CXXSTD= c++11 -USE_GNOME= libxml2 -USE_LDCONFIG= yes -USES= compiler:c++11-lang gnome libtool pathfix pkgconfig ssl tar:xz - -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/examples/spdycli ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/shrpx.conf.sample ${STAGEDIR}${PREFIX}/etc/ - -.include <bsd.port.mk> diff --git a/www/spdylay/distinfo b/www/spdylay/distinfo deleted file mode 100644 index 021a8522a7f8..000000000000 --- a/www/spdylay/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1479405022 -SHA256 (spdylay-1.4.0.tar.xz) = 1a133578dd330f5ff3b1c25798c0594e39858e6a050513e5d7ec31eda6e89341 -SIZE (spdylay-1.4.0.tar.xz) = 672332 diff --git a/www/spdylay/pkg-descr b/www/spdylay/pkg-descr deleted file mode 100644 index 72f1c712fbfc..000000000000 --- a/www/spdylay/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Spdylay - SPDY C Library - -This is an experimental implementation of Google's SPDY protocol in C. This -library provides SPDY version 2, 3 and 3.1 framing layer implementation. It does -not perform any I/O operations. When the library needs them, it calls the -callback functions provided by the application. It also does not include any -event polling mechanism, so the application can freely choose the way of -handling events. This library code does not depend on any particular SSL library -(except for example programs which depend on OpenSSL 1.0.1 or later). - -This project also develops SPDY client, server and proxy on top of Spdylay -library. - -WWW: https://tatsuhiro-t.github.io/spdylay/ diff --git a/www/spdylay/pkg-plist b/www/spdylay/pkg-plist deleted file mode 100644 index 5ce7bbb49e73..000000000000 --- a/www/spdylay/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -bin/shrpx -bin/spdycat -bin/spdycli -bin/spdyd -etc/shrpx.conf.sample -include/spdylay/spdylay.h -include/spdylay/spdylayver.h -lib/libspdylay.a -lib/libspdylay.so -lib/libspdylay.so.7 -lib/libspdylay.so.7.2.1 -libdata/pkgconfig/libspdylay.pc diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 737f0c06578b..93f7f3ba4e1e 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -285,7 +285,6 @@ SUBDIR += vte SUBDIR += vte-reference SUBDIR += vte3 - SUBDIR += wlc SUBDIR += wmapp SUBDIR += wxgtk28 SUBDIR += wxgtk28-common diff --git a/x11-toolkits/wlc/Makefile b/x11-toolkits/wlc/Makefile deleted file mode 100644 index 0006dcf248fa..000000000000 --- a/x11-toolkits/wlc/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# $FreeBSD$ - -PORTNAME= wlc -PORTVERSION= 0.0.8 -PORTREVISION= 2 -CATEGORIES= x11-toolkits wayland - -MAINTAINER= x11@FreeBSD.org -COMMENT= Wayland compositor library - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE= 2018-12-31 - -LICENSE= MIT -LICENSE_FILES= ${WRKSRC}/LISENSE - -BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \ - ${LOCALBASE}/include/linux/input.h:devel/evdev-proto -LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \ - libxcb-ewmh.so:x11/xcb-util-wm \ - libwayland-server.so:graphics/wayland \ - libdrm.so:graphics/libdrm \ - libudev.so:devel/libudev-devd \ - libinput.so:x11/libinput \ - libxcb-image.so:x11/xcb-util-image - -RUN_DEPENDS= xkeyboard-config>=0:x11/xkeyboard-config - -USE_GITHUB= yes -GH_ACCOUNT= cloudef -GH_TAGNAME= fa780ce -GH_TUPLE= cloudef:chck:3f27d2a:chck - -USES= cmake gnome localbase pkgconfig pathfix -USE_XORG= pixman x11 xcb xcursor xfixes -USE_GL= egl gbm glesv2 -USE_GNOME= cairo - -USE_LDCONFIG= yes - -post-extract: - @${RM} -r ${WRKSRC}/lib/chck - @${LN} -s ${WRKSRC_chck} ${WRKSRC}/lib/chck - -.include <bsd.port.mk> diff --git a/x11-toolkits/wlc/distinfo b/x11-toolkits/wlc/distinfo deleted file mode 100644 index a37c6796eb25..000000000000 --- a/x11-toolkits/wlc/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1488036711 -SHA256 (cloudef-wlc-0.0.8-fa780ce_GH0.tar.gz) = bf22b99b52cc2fb4ecc27da90ee47f516f8d5d1a02afdc495488c14d01788bc8 -SIZE (cloudef-wlc-0.0.8-fa780ce_GH0.tar.gz) = 120603 -SHA256 (cloudef-chck-3f27d2a_GH0.tar.gz) = fa3765dbaad52e968aae8b9a06a8ace24fab0d9ca53cc08a1f5543ff33959ebd -SIZE (cloudef-chck-3f27d2a_GH0.tar.gz) = 119955 diff --git a/x11-toolkits/wlc/files/patch-src_session_fd.c b/x11-toolkits/wlc/files/patch-src_session_fd.c deleted file mode 100644 index 341a8fd8974d..000000000000 --- a/x11-toolkits/wlc/files/patch-src_session_fd.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/session/fd.c.orig 2016-08-19 13:28:50 UTC -+++ src/session/fd.c -@@ -10,7 +10,9 @@ - #include <sys/select.h> - #include <sys/socket.h> - #include <sys/types.h> -+#if !defined(__FreeBSD__) - #include <linux/major.h> -+#endif - #include <xf86drm.h> - #include "internal.h" - #include "macros.h" -@@ -135,7 +137,7 @@ recv_fd(int sock, int *out_fd, void *out - return read; - - if (message.msg_controllen == 0) -- return read; -+ return read; - - if (!(cmsg = CMSG_FIRSTHDR(&message))) - return read; -@@ -171,6 +173,7 @@ fd_open(const char *path, int flags, enu - } - - /* we will only open allowed paths */ -+#if !defined(__FreeBSD__) - #define FILTER(x, m) { x, (sizeof(x) > 32 ? 32 : sizeof(x)) - 1, m } - static struct { - const char *base; -@@ -186,14 +189,15 @@ fd_open(const char *path, int flags, enu - wlc_log(WLC_LOG_WARN, "Denying open from: %s", path); - return -1; - } -+#endif - - struct stat st; - if (stat(path, &st) < 0) -- return -1; -+ return -1; - --#ifdef __linux__ -+#if !defined(__FreeBSD__) - if (major(st.st_rdev) != allow[type].major) -- return -1; -+ return -1; - #endif - - int fd; diff --git a/x11-toolkits/wlc/files/patch-src_session_tty.c b/x11-toolkits/wlc/files/patch-src_session_tty.c deleted file mode 100644 index 888296ba5e77..000000000000 --- a/x11-toolkits/wlc/files/patch-src_session_tty.c +++ /dev/null @@ -1,165 +0,0 @@ ---- src/session/tty.c.orig 2016-08-19 13:28:50 UTC -+++ src/session/tty.c -@@ -9,27 +9,18 @@ - #include "internal.h" - #include "tty.h" - --#if defined(__linux__) --# define TTY_BASENAME "/dev/tty" --# define TTY_0 "/dev/tty0" --# include <linux/kd.h> --# include <linux/major.h> --# include <linux/vt.h> --#elif defined(__FreeBSD__) -+#if defined(__FreeBSD__) -+# include <termios.h> - # include <sys/consio.h> - # include <sys/kbio.h> - # define TTY_BASENAME "/dev/ttyv" - # define TTY_0 "/dev/ttyv0" --# define TTY_MAJOR 0 --# define VT_GETSTATE 0x5603 --# define VT_ACTIVATE 0x5606 --# define K_UNICODE 0x03 --# define K_OFF 0x04 --struct vt_stat { -- unsigned short v_active; /* active vt */ -- unsigned short v_signal; /* signal to send */ -- unsigned short v_state; /* vt bitmask */ --}; -+#else -+# include <linux/kd.h> -+# include <linux/major.h> -+# include <linux/vt.h> -+# define TTY_BASENAME "/dev/tty" -+# define TTY_0 "/dev/tty0" - #endif - - #ifndef KDSKBMUTE -@@ -100,22 +91,22 @@ open_tty(int vt) - } - - static bool --setup_tty(int fd, bool replace_vt) -+setup_tty(int fd, int vt, bool replace_vt) - { - if (fd < 0) - return false; - -+#if defined(__FreeBSD__) -+ wlc.vt = vt+1; -+#else - struct stat st; - if (fstat(fd, &st) == -1) - die("Could not stat tty fd"); -- - wlc.vt = minor(st.st_rdev); -- - if (major(st.st_rdev) != TTY_MAJOR || wlc.vt == 0) - die("Not a valid vt"); -+#endif - --/* FreeBSD's new vt is still missing some bits */ --#if defined(__linux__) - if (!replace_vt) { - int kd_mode; - if (ioctl(fd, KDGETMODE, &kd_mode) == -1) -@@ -125,18 +116,20 @@ setup_tty(int fd, bool replace_vt) - die("vt%d is already in graphics mode (%d). Is another display server running?", wlc.vt, kd_mode); - } - -+#if defined(__FreeBSD__) -+ ioctl(fd, VT_GETACTIVE, &wlc.old_state.vt); -+#else - struct vt_stat state; - if (ioctl(fd, VT_GETSTATE, &state) == -1) - die("Could not get current vt"); -- - wlc.old_state.vt = state.v_active; -+#endif - - if (ioctl(fd, VT_ACTIVATE, wlc.vt) == -1) - die("Could not activate vt%d", wlc.vt); - - if (ioctl(fd, VT_WAITACTIVE, wlc.vt) == -1) - die("Could not wait for vt%d to become active", wlc.vt); --#endif - - if (ioctl(fd, KDGKBMODE, &wlc.old_state.kb_mode) == -1) - die("Could not get keyboard mode"); -@@ -144,7 +137,19 @@ setup_tty(int fd, bool replace_vt) - // vt will be restored from now on - wlc.tty = fd; - --#if defined(__linux__) -+#if defined(__FreeBSD__) -+ if (ioctl(fd, KDSKBMODE, K_CODE) == -1) { -+ wlc_tty_terminate(); -+ die("Could not set keyboard mode to K_CODE"); -+ } -+ /* Put the tty into raw mode */ -+ struct termios tios; -+ if (tcgetattr(fd, &tios)) -+ die("Failed to get terminal attribute"); -+ cfmakeraw(&tios); -+ if (tcsetattr(fd, TCSANOW, &tios)) -+ die("Failed to set terminal attribute"); -+#else - if (ioctl(fd, KDSKBMUTE, 1) == -1 && ioctl(fd, KDSKBMODE, K_OFF) == -1) { - wlc_tty_terminate(); - die("Could not set keyboard mode to K_OFF"); -@@ -156,18 +161,19 @@ setup_tty(int fd, bool replace_vt) - die("Could not set console mode to KD_GRAPHICS"); - } - --#if defined(__linux__) - struct vt_mode mode = { - .mode = VT_PROCESS, - .relsig = SIGUSR1, - .acqsig = SIGUSR2 - }; -+#if defined(__FreeBSD__) -+ mode.frsig = SIGIO; /* not used, but has to be set anyway */ -+#endif - - if (ioctl(fd, VT_SETMODE, &mode) == -1) { - wlc_tty_terminate(); - die("Could not set vt%d mode", wlc.vt); - } --#endif - - return true; - } -@@ -230,13 +236,19 @@ wlc_tty_terminate(void) - // The ACTIVATE / WAITACTIVE may be potentially bad here. - // However, we need to make sure the vt we initially opened is also active on cleanup. - // We can't make sure this is synchronized due to unclean exits. -+ - if (ioctl(wlc.tty, VT_ACTIVATE, wlc.vt) != -1 && ioctl(wlc.tty, VT_WAITACTIVE, wlc.vt) != -1) { - wlc_log(WLC_LOG_INFO, "Restoring vt %d (0x%lx) (fd %d)", wlc.vt, wlc.old_state.kb_mode, wlc.tty); - -- if (ioctl(wlc.tty, KDSKBMUTE, 0) == -1 && -- ioctl(wlc.tty, KDSKBMODE, wlc.old_state.kb_mode) == -1 && -- ioctl(wlc.tty, KDSKBMODE, K_UNICODE) == -1) -- wlc_log(WLC_LOG_ERROR, "Failed to restore vt%d KDSKMODE", wlc.vt); -+#if defined(__FreeBSD__) -+ if (ioctl(wlc.tty, KDSKBMODE, wlc.old_state.kb_mode) == -1 && -+ ioctl(wlc.tty, KDSKBMODE, K_XLATE) == -1) -+#else -+ if (ioctl(wlc.tty, KDSKBMUTE, 0) == -1 && -+ ioctl(wlc.tty, KDSKBMODE, wlc.old_state.kb_mode) == -1 && -+ ioctl(wlc.tty, KDSKBMODE, K_UNICODE) == -1) -+#endif -+ wlc_log(WLC_LOG_ERROR, "Failed to restore vt%d KDSKMODE", wlc.vt); - - if (ioctl(wlc.tty, KDSETMODE, KD_TEXT) == -1) - wlc_log(WLC_LOG_ERROR, "Failed to restore vt%d mode to VT_AUTO", wlc.vt); -@@ -271,7 +283,7 @@ wlc_tty_init(int vt) - if (!vt && !(vt = find_vt(getenv("XDG_VTNR"), &replace_vt))) - die("Could not find vt"); - -- if (!setup_tty(open_tty(vt), replace_vt)) -+ if (!setup_tty(open_tty(vt), vt, replace_vt)) - die("Could not open tty with vt%d", vt); - - struct sigaction action = { diff --git a/x11-toolkits/wlc/pkg-descr b/x11-toolkits/wlc/pkg-descr deleted file mode 100644 index 525e5adec4b1..000000000000 --- a/x11-toolkits/wlc/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Wayland compositor library - -WWW: https://github.com/Cloudef/wlc diff --git a/x11-toolkits/wlc/pkg-plist b/x11-toolkits/wlc/pkg-plist deleted file mode 100644 index 9b8ec78ed1a7..000000000000 --- a/x11-toolkits/wlc/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -include/wlc/defines.h -include/wlc/geometry.h -include/wlc/wlc-render.h -include/wlc/wlc-wayland.h -include/wlc/wlc.h -lib/libwlc.so -lib/libwlc.so.0 -lib/libwlc.so.0.0.5 -libdata/pkgconfig/wlc.pc |