Re: update java/gradle to 8.3
On Sat, Sep 16, 2023 at 02:52:54PM +0100, Stuart Henderson wrote: > (+cc ghidra maintainer) > > On 2023/09/16 14:55, Peter Hessler wrote: > > > > On 2023 Sep 16 (Sat) at 07:30:46 -0400 (-0400), Ian Darwin wrote: > > :On Sat, Sep 16, 2023 at 11:36:08AM +0100, Stuart Henderson wrote: > > :> > Unfortunately there is a show-stopper here. We have to fix/update > > :> > security/ghidra which is not trivial. > > :> > > :> The ghidra port is really outdated, even from just a quick look at > > :> release notes various of the changes look security-related, not what you > > :> want when analysing (possibly malicious) binaries. At this point, > > :> especially since it was already noticed >1y ago, I don't think ghidra > > :> should stand in the way of updatng gradle, I'd be ok with marking ghidra > > :> BROKEN and updating gradle. > > : > > :I concur. > > : > > > > So to me the only question is timing. Do we disable ghirda before > > release because it is so dangerous, or do we disable it after release and > > give interested people some time to fix it? > > I think it would be reasonable to do that before release. > > If somebody already has ghidra installed and upgrades, it won't > disappear (and because it's java software, shouldn't have compat > problems due to syscall changes etc, because the jdk package will > still be updated). > > And if not, at least they won't get a 3yo version if they run > "pkg_add ghidra" from scratch. > > (Also, since current versions of ghidra themselves now use jdk 17, > afaik updating gradle will be a prerequisite to updating ghidra anyway). I have marked the Ghidra port as BROKEN. I looked into updating Ghidra sometime ago and it was a lot of work, so I agree that it's best that we mark it as BROKEN before release since it's unlikely that it can be updated before release. phessler, I'm ok with your java/gradle update. Thanks, Lawrence
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2023/09/16 10:23:32 Modified files: security/ghidra: Makefile Log message: Mark as BROKEN so that we don't ship with an outdated Ghidra package, and so that the Ghidra port does not hold back java/gradle updates. Significant work is required to update Ghidra to the latest version. Prompted by a discussion with sthen@ ian@ rsadowski@ phessler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/12/18 20:40:33 Modified files: security/ghidra: Tag: OPENBSD_7_0 Makefile distinfo security/ghidra/pkg: Tag: OPENBSD_7_0 PLIST Log message: Bump Ghidra's log4j jar files to 2.17.0 which addresses CVE-2021-45105
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/12/18 20:36:25 Modified files: security/ghidra: Makefile distinfo security/ghidra/pkg: PLIST Log message: Bump Ghidra's log4j jar files to 2.17.0 which addresses CVE-2021-45105
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/12/17 20:15:40 Modified files: security/ghidra: Tag: OPENBSD_7_0 Makefile distinfo security/ghidra/pkg: Tag: OPENBSD_7_0 PLIST Log message: Replace Ghidra -stable's log4j jar files with the latest release 2.16.0 from ASF
Re: security/ghidra - replace log4j
On Tue, Dec 14, 2021 at 10:45:52AM +, Stuart Henderson wrote:
> On 2021/12/14 00:12, Lawrence Teo wrote:
> > The latest Ghidra release 10.1 has a fix for the log4j vulnerability;
> > however, updating the port to that version is very complex and
> > unfortunately I do not have enough time to work on it at the moment.
> >
> > As a workaround, this diff updates the log4j jar files in
> > security/ghidra to 2.15.0. I was about to fetch the log4j jar files
> > from https://logging.apache.org/log4j/2.x/download.html when I noticed
> > sthen's net/unifi update which fetches them from spacehopper.org
> > instead. This diff uses the latter approach.
> >
> > ok?
>
> Ah I switched unifi over to using the proper distfiles from apache.org
> before I read your mail, the ones I mirrored came from a newer version of
> unifi. You can use them if you like but I can't vouch for exactly what's
> in them other than "ubiquiti thought they were OK" - hashes differ
> into the upstream release (I didn't look further to what was changed
> inbetween them).
Thank you for your feedback. I decided to use the ones from apache.org
as well (2.16.0). I have committed the fix.
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/ghidra/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile19 Jul 2020 01:29:23 - 1.8
> > +++ Makefile14 Dec 2021 04:43:32 -
> > @@ -7,6 +7,7 @@ COMMENT = software reverse engineering (
> >
> > VERSION = 9.1.2
> > GHIDRA_DATE = 20200212
> > +REVISION = 0
> >
> > GH_ACCOUNT = NationalSecurityAgency
> > GH_PROJECT = ghidra
> > @@ -27,6 +28,7 @@ WANTLIB +=c m ${COMPILER_LIBCXX}
> > MASTER_SITES0 =${HOMEPAGE}
> > MASTER_SITES1 =
> > https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
> > MASTER_SITES2 =https://repo.maven.apache.org/maven2/
> > +MASTER_SITES3 =https://spacehopper.org/mirrors/
> >
> > EXTRACT_SUFX = .zip
> >
> > @@ -37,6 +39,7 @@ JMOCKIT_VER = 1.44
> > JSON_SIMPLE_VER = 1.1.1
> > JUNIT_VER =4.12
> > YAJSW_VER =12.12
> > +LOG4J_VER =2.15.0
> >
> > # Note that ST4-${ST4_VER}.jar is only needed during build for antlr; it
> > is not
> > # needed at runtime and therefore does not need to be packed.
> > @@ -51,6 +54,8 @@ DISTFILES = ${DISTNAME}.tar.gz
> > DISTFILES +=
> > ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
> > DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
> > DISTFILES += ${JAR_DISTFILES:C/$/:2/}
> > +DISTFILES += log4j-api-${LOG4J_VER}.jar:3
> > +DISTFILES += log4j-core-${LOG4J_VER}.jar:3
> >
> > EXTRACT_ONLY = ${DISTNAME}.tar.gz
> >
> > @@ -138,5 +143,10 @@ do-install:
> > ln -s ${TRUEPREFIX}/share/java/ghidra/ghidraRun ${PREFIX}/bin/ghidraRun
> > ${INSTALL_SCRIPT}
> > ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh \
> > ${PREFIX}/share/java/ghidra/support/launch.sh
> > + rm -f
> > ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-{api,core}-*.jar
> > + ${INSTALL_DATA} ${FULLDISTDIR}/log4j-api-${LOG4J_VER}.jar \
> > + ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
> > + ${INSTALL_DATA} ${FULLDISTDIR}/log4j-core-${LOG4J_VER}.jar \
> > + ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
> >
> > .include
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/security/ghidra/distinfo,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 distinfo
> > --- distinfo19 Jul 2020 01:29:23 - 1.4
> > +++ distinfo14 Dec 2021 04:43:32 -
> > @@ -6,6 +6,8 @@ SHA256 (javacc-5.0.jar) = cRExYbyM9mQVFV
> > SHA256 (jmockit-1.44.jar) = GXSZN1EzMkhCbdusNwpgSUTt9mXBPUakxelz5N2PqUo=
> > SHA256 (json-simple-1.1.1.jar) =
> > TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=
> > SHA256 (junit-4.12.jar) = WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=
> > +SHA256 (log4j-api-2.15.0.jar) =
> > yMM+fo4FSW2uac8MqsjDCSz/2TehZFJukpItLVZtClU=
> > +SHA256 (log4j-core-2.15.0.jar) =
> > QZqFEolZcbe09PM+Yg02ElTlyVUrkEsEdLCd3UpqIgs=
> > SHA256 (yajsw-stable-12
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/12/14 20:22:19 Modified files: security/ghidra: Makefile distinfo security/ghidra/pkg: PLIST Log message: Replace Ghidra's log4j jar files with the latest release 2.16.0 from ASF. Feedback on earlier diff from sthen@ and Bastian Wessling
security/ghidra - replace log4j
The latest Ghidra release 10.1 has a fix for the log4j vulnerability;
however, updating the port to that version is very complex and
unfortunately I do not have enough time to work on it at the moment.
As a workaround, this diff updates the log4j jar files in
security/ghidra to 2.15.0. I was about to fetch the log4j jar files
from https://logging.apache.org/log4j/2.x/download.html when I noticed
sthen's net/unifi update which fetches them from spacehopper.org
instead. This diff uses the latter approach.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile19 Jul 2020 01:29:23 - 1.8
+++ Makefile14 Dec 2021 04:43:32 -
@@ -7,6 +7,7 @@ COMMENT = software reverse engineering (
VERSION = 9.1.2
GHIDRA_DATE = 20200212
+REVISION = 0
GH_ACCOUNT = NationalSecurityAgency
GH_PROJECT = ghidra
@@ -27,6 +28,7 @@ WANTLIB +=c m ${COMPILER_LIBCXX}
MASTER_SITES0 =${HOMEPAGE}
MASTER_SITES1 =
https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
MASTER_SITES2 =https://repo.maven.apache.org/maven2/
+MASTER_SITES3 =https://spacehopper.org/mirrors/
EXTRACT_SUFX = .zip
@@ -37,6 +39,7 @@ JMOCKIT_VER = 1.44
JSON_SIMPLE_VER = 1.1.1
JUNIT_VER =4.12
YAJSW_VER =12.12
+LOG4J_VER =2.15.0
# Note that ST4-${ST4_VER}.jar is only needed during build for antlr; it is not
# needed at runtime and therefore does not need to be packed.
@@ -51,6 +54,8 @@ DISTFILES = ${DISTNAME}.tar.gz
DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
DISTFILES += ${JAR_DISTFILES:C/$/:2/}
+DISTFILES += log4j-api-${LOG4J_VER}.jar:3
+DISTFILES += log4j-core-${LOG4J_VER}.jar:3
EXTRACT_ONLY = ${DISTNAME}.tar.gz
@@ -138,5 +143,10 @@ do-install:
ln -s ${TRUEPREFIX}/share/java/ghidra/ghidraRun ${PREFIX}/bin/ghidraRun
${INSTALL_SCRIPT}
${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh \
${PREFIX}/share/java/ghidra/support/launch.sh
+ rm -f
${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-{api,core}-*.jar
+ ${INSTALL_DATA} ${FULLDISTDIR}/log4j-api-${LOG4J_VER}.jar \
+ ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
+ ${INSTALL_DATA} ${FULLDISTDIR}/log4j-core-${LOG4J_VER}.jar \
+ ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
.include
Index: distinfo
===
RCS file: /cvs/ports/security/ghidra/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo19 Jul 2020 01:29:23 - 1.4
+++ distinfo14 Dec 2021 04:43:32 -
@@ -6,6 +6,8 @@ SHA256 (javacc-5.0.jar) = cRExYbyM9mQVFV
SHA256 (jmockit-1.44.jar) = GXSZN1EzMkhCbdusNwpgSUTt9mXBPUakxelz5N2PqUo=
SHA256 (json-simple-1.1.1.jar) = TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=
SHA256 (junit-4.12.jar) = WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=
+SHA256 (log4j-api-2.15.0.jar) = yMM+fo4FSW2uac8MqsjDCSz/2TehZFJukpItLVZtClU=
+SHA256 (log4j-core-2.15.0.jar) = QZqFEolZcbe09PM+Yg02ElTlyVUrkEsEdLCd3UpqIgs=
SHA256 (yajsw-stable-12.12.zip) = E5j8sek6uxmZLE+gbX/ldYqrtMRXgdfvMGxvV8p6cyE=
SIZE (ST4-4.1.jar) = 253043
SIZE (ghidra-9.1.2.tar.gz) = 59623429
@@ -15,4 +17,6 @@ SIZE (javacc-5.0.jar) = 298569
SIZE (jmockit-1.44.jar) = 757982
SIZE (json-simple-1.1.1.jar) = 23931
SIZE (junit-4.12.jar) = 314932
+SIZE (log4j-api-2.15.0.jar) = 301804
+SIZE (log4j-core-2.15.0.jar) = 1789769
SIZE (yajsw-stable-12.12.zip) = 25051676
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/ghidra/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 19 Jul 2020 01:29:23 - 1.4
+++ pkg/PLIST 14 Dec 2021 04:43:34 -
@@ -2304,8 +2304,8 @@ share/java/ghidra/Ghidra/Framework/Gener
share/java/ghidra/Ghidra/Framework/Generic/lib/commons-lang3-3.9.jar
share/java/ghidra/Ghidra/Framework/Generic/lib/guava-19.0.jar
share/java/ghidra/Ghidra/Framework/Generic/lib/jdom-legacy-1.1.3.jar
-share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-api-2.8.2.jar
-share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-core-2.8.2.jar
+share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-api-2.15.0.jar
+share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-core-2.15.0.jar
share/java/ghidra/Ghidra/Framework/Graph/
share/java/ghidra/Ghidra/Framework/Graph/LICENSE.txt
share/java/ghidra/Ghidra/Framework/Graph/Module.manifest
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/07/12 20:02:09 Modified files: net/iperf3 : Makefile distinfo Log message: Update to iperf-3.10.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/07/10 20:11:34 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_dynamic-plugins_sf_engine_Makefile_in patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_appid_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_s7commplus_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in patch-src_preprocessors_Stream6_snort_stream_tcp_c patch-src_util_c Log message: Update to Snort 2.9.18, from maintainer Markus Lude
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/07/10 20:09:00 Modified files: net/iperf3 : Makefile distinfo Log message: Update to iperf-3.10 >From wen heping, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/04/06 20:00:53 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_decode_h patch-src_dynamic-plugins_sf_engine_Makefile_in patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_appid_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_s7commplus_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in patch-src_preprocessors_Stream6_snort_stream_tcp_c Log message: Update to Snort 2.9.17.1, from maintainer Markus Lude
Re: [update] net/snort 2.9.17, fix for -fno-common
Thanks for the ping and sorry about the delay. I have committed your
update.
Lawrence
On Mon, Feb 15, 2021 at 07:13:52PM +0100, Markus Lude wrote:
> ping
>
> On Tue, Feb 09, 2021 at 11:51:25PM +0100, Markus Lude wrote:
> > Hello,
> >
> > attached is an update to snort 2.9.17. The new version includes fixes
> > for gcc-10. Tested on amd64.
> >
> > Please test and eventually commit. Thanks.
> >
> > Regards,
> > Markus
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/snort/Makefile,v
> retrieving revision 1.107
> diff -u -p -u -p -r1.107 Makefile
> --- Makefile 27 May 2020 02:32:10 - 1.107
> +++ Makefile 9 Feb 2021 22:46:07 -
> @@ -2,8 +2,8 @@
>
> COMMENT =highly flexible sniffer/NIDS
>
> -DISTNAME = snort-2.9.16
> -RULESV = 29160
> +DISTNAME = snort-2.9.17
> +RULESV = 29170
> SUBST_VARS = RULESV
>
> CATEGORIES = net security
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/snort/distinfo,v
> retrieving revision 1.43
> diff -u -p -u -p -r1.43 distinfo
> --- distinfo 27 May 2020 02:32:10 - 1.43
> +++ distinfo 9 Feb 2021 22:46:07 -
> @@ -1,2 +1,2 @@
> -SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
> -SIZE (snort-2.9.16.tar.gz) = 6948498
> +SHA256 (snort-2.9.17.tar.gz) = w7I0w5IqCbA2i4R9240fo3G3QfAy9Cqpq1PWe0KNxkg=
> +SIZE (snort-2.9.17.tar.gz) = 6983018
> Index: patches/patch-src_decode_h
> ===
> RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 patch-src_decode_h
> --- patches/patch-src_decode_h27 May 2020 02:32:10 - 1.12
> +++ patches/patch-src_decode_h9 Feb 2021 22:46:07 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.12 2020
> Index: src/decode.h
> --- src/decode.h.orig
> +++ src/decode.h
> -@@ -837,9 +837,9 @@ typedef struct _SLLHdr {
> +@@ -839,9 +839,9 @@ typedef struct _SLLHdr {
>* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
>* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
>* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
> Index: patches/patch-src_dynamic-preprocessors_Makefile_in
> ===
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 patch-src_dynamic-preprocessors_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_Makefile_in 27 May 2020
> 02:32:10 - 1.21
> +++ patches/patch-src_dynamic-preprocessors_Makefile_in 9 Feb 2021
> 22:46:07 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
> Index: src/dynamic-preprocessors/Makefile.in
> --- src/dynamic-preprocessors/Makefile.in.orig
> +++ src/dynamic-preprocessors/Makefile.in
> -@@ -1649,19 +1649,8 @@ clean-local:
> +@@ -1650,19 +1650,8 @@ clean-local:
> rm -rf include build
>
> install-data-local:
> Index: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
> ===
> RCS file: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
> diff -N patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in9 Feb
> 2021 22:46:07 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: src/dynamic-preprocessors/s7commplus/Makefile.in
> +--- src/dynamic-preprocessors/s7commplus/Makefile.in.orig
> src/dynamic-preprocessors/s7commplus/Makefile.in
> +@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@
> + AUTOMAKE_OPTIONS = foreign no-dependencies
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_s7commplus_preproc.la
> +-libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> ++libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module
> -avoid-version @XCCFLAGS@
> + @SO_WITH_STATIC_LIB_TRUE@libsf_s7commplus_preproc_la_LIBADD =
> ../libsf_dynamic_preproc.la
> + @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_s7commplus_preproc_la_SOURCES = \
> + @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
> +@@ -546,7 +546,7 @@ distdir-am: $(DISTFILES)
> + done
> + check-am: all-am
> + check: check-am
> +-all-am: Makefile $(LTLIBRARIES) all-local
> ++all-am: Makefile $(LTLIBRARIES)
> + installdirs:
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_log_c
> ===
> RCS file: /cvs/ports/net/snort/patches/patch-src_log_c,v
> retrieving revision 1.8
> diff -u
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/02/15 20:02:38 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_decode_h patch-src_dynamic-preprocessors_Makefile_in patch-src_log_c patch-src_preprocessors_Stream6_snort_stream_tcp_c net/snort/pkg : PLIST Log message: Update to Snort 2.9.17, with a fix for -fno-common >From maintainer Markus Lude
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2020/10/28 20:22:25 Modified files: java/gradle: Makefile distinfo java/gradle/pkg: PLIST Log message: Update to Gradle 6.7. https://docs.gradle.org/6.7/release-notes.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2020/08/18 20:01:32 Modified files: java/gradle: Makefile distinfo java/gradle/patches: patch-bin_gradle java/gradle/pkg: PLIST Log message: Update to Gradle 6.6. https://docs.gradle.org/6.6/release-notes.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2020/07/20 20:04:23 Modified files: net/iperf3 : Makefile distinfo Log message: Update to iperf-3.8.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2020/07/18 19:29:23 Modified files: security/ghidra: Makefile distinfo security/ghidra/patches: patch-GPL_CabExtract_build_gradle patch-GPL_DemanglerGnu_build_gradle patch-GPL_nativeBuildProperties_gradle patch-Ghidra_Features_Decompiler_build_gradle patch-Ghidra_Features_FunctionID_build_gradle patch-Ghidra_Framework_SoftwareModeling_build_gradle patch-build_gradle security/ghidra/pkg: PLIST Added files: security/ghidra/patches: patch-gradle_support_ip_gradle Removed files: security/ghidra/patches: patch-gradleScripts_distribution_gradle patch-gradleScripts_ip_gradle Log message: Update to Ghidra 9.1.2. https://ghidra-sre.org/releaseNotes_9.1.2.html Thanks to Jeremy O'Brien for testing!
UPDATE: security/ghidra 9.1.2
This updates Ghidra to 9.1.2.
https://ghidra-sre.org/releaseNotes_9.1.2.html
This builds fine with either java/gradle that is in tree at the time of
writing, or my java/gradle 6.5.1 update at
https://marc.info/?l=openbsd-ports=159443485213555=2
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Sep 2019 02:10:07 - 1.7
+++ Makefile8 Jul 2020 23:44:47 -
@@ -5,9 +5,8 @@ ONLY_FOR_ARCHS =amd64
COMMENT = software reverse engineering (SRE) framework
-VERSION = 9.0.4
-GHIDRA_DATE = 20190516
-REVISION = 3
+VERSION = 9.1.2
+GHIDRA_DATE = 20200212
GH_ACCOUNT = NationalSecurityAgency
GH_PROJECT = ghidra
@@ -98,19 +97,20 @@ pre-build:
${SUBST_CMD} ${WRKDIR}/repos.gradle \
${WRKSRC}/GPL/nativeBuildProperties.gradle \
${WRKSRC}/Ghidra/Framework/Help/src/main/java/help/GHelpBuilder.java
- mkdir ${WRKDIR}/{flatRepo,gradle,home}
+ mkdir ${WRKDIR}/{gradle,home}
+ mkdir ${WRKSRC}/flatRepo
.for dir in ${JAR_DIRS}
unzip -j ${DISTDIR}/ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}.zip \
- -d ${WRKDIR}/flatRepo \
-
ghidra_${VERSION}/Ghidra/${dir:C/-.*$//}/${dir:C/^.*-//}/lib/*.jar \
- -x
ghidra_${VERSION}/Ghidra/${dir:C/-.*$//}/${dir:C/^.*-//}/lib/${dir:C/^.*-//}.jar
+ -d ${WRKSRC}/flatRepo \
+
ghidra_${VERSION}_PUBLIC/Ghidra/${dir:C/-.*$//}/${dir:C/^.*-//}/lib/*.jar \
+ -x
ghidra_${VERSION}_PUBLIC/Ghidra/${dir:C/-.*$//}/${dir:C/^.*-//}/lib/${dir:C/^.*-//}.jar
.endfor
.for name in csframework hfsx_dmglib hfsx iharder-base64
cp ${WRKSRC}/GPL/DMG/data/lib/catacombae_${name}.jar \
- ${WRKDIR}/flatRepo/${name}.jar
+ ${WRKSRC}/flatRepo/${name}.jar
.endfor
.for jar_file in ${JAR_DISTFILES:C/{.*}//}
- cp ${DISTDIR}/${jar_file} ${WRKDIR}/flatRepo
+ cp ${DISTDIR}/${jar_file} ${WRKSRC}/flatRepo
.endfor
mkdir -p ${WRKDIR}/ghidra.bin/Ghidra/Features/GhidraServer
cp ${DISTDIR}/yajsw-stable-${YAJSW_VER}.zip \
@@ -127,12 +127,12 @@ do-build:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/java
unzip -d ${PREFIX}/share/java \
- ${WRKSRC}/build/dist/ghidra_${VERSION}_PUBLIC_*_openbsd64.zip
- mv ${PREFIX}/share/java/ghidra_${VERSION} ${PREFIX}/share/java/ghidra
- mv
${PREFIX}/share/java/ghidra/Extensions/Ghidra/ghidra_${VERSION}_PUBLIC_*_SampleTablePlugin.zip
\
-
${PREFIX}/share/java/ghidra/Extensions/Ghidra/ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}_SampleTablePlugin.zip
- mv
${PREFIX}/share/java/ghidra/Extensions/Ghidra/ghidra_${VERSION}_PUBLIC_*_sample.zip
\
-
${PREFIX}/share/java/ghidra/Extensions/Ghidra/ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}_sample.zip
+ ${WRKSRC}/build/dist/ghidra_${VERSION}_DEV_*_openbsd64.zip
+ mv ${PREFIX}/share/java/ghidra_${VERSION}_DEV
${PREFIX}/share/java/ghidra
+.for name in GnuDisassembler SampleTablePlugin SleighDevTools sample
+ mv
${PREFIX}/share/java/ghidra/Extensions/Ghidra/ghidra_${VERSION}_DEV_*_${name}.zip
\
+
${PREFIX}/share/java/ghidra/Extensions/Ghidra/ghidra_${VERSION}_DEV_${GHIDRA_DATE}_${name}.zip
+.endfor
${INSTALL_SCRIPT} ${WRKSRC}/Ghidra/RuntimeScripts/Linux/ghidraRun \
${PREFIX}/share/java/ghidra/ghidraRun
ln -s ${TRUEPREFIX}/share/java/ghidra/ghidraRun ${PREFIX}/bin/ghidraRun
Index: distinfo
===
RCS file: /cvs/ports/security/ghidra/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo23 Jul 2019 02:09:20 - 1.3
+++ distinfo5 Jul 2020 01:06:03 -
@@ -1,6 +1,6 @@
SHA256 (ST4-4.1.jar) = ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=
-SHA256 (ghidra-9.0.4.tar.gz) = 4kWT+0zz4dG3qN/q6F7fup/Z1EazYMel0S6WQEOHNeM=
-SHA256 (ghidra_9.0.4_PUBLIC_20190516.zip) =
pQ0M1HXZN3MygR7q5m6Uvcnn2I5YR3xSfpxreMrsGL8=
+SHA256 (ghidra-9.1.2.tar.gz) = XIgIIz/xTt43sAHDT69BxR5qBfTlHE0HcPQg46VI91g=
+SHA256 (ghidra_9.1.2_PUBLIC_20200212.zip) =
6+P6Thr9fZdlCZCyd3e7eL0EJ+jnDB0O4EKutS3srGE=
SHA256 (hamcrest-all-1.3.jar) = SHdnBimrlvNPX5CrKDEl/Nmst+aD5mMZpovm6yzKYN4=
SHA256 (javacc-5.0.jar) = cRExYbyM9mQVFVQcKBgCi4fHjsLo/6p1MXaG7giWe4k=
SHA256 (jmockit-1.44.jar) = GXSZN1EzMkhCbdusNwpgSUTt9mXBPUakxelz5N2PqUo=
@@ -8,8 +8,8 @@ SHA256 (json-simple-1.1.1.jar) = TmlpaJK
SHA256 (junit-4.12.jar) = WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=
SHA256 (yajsw-stable-12.12.zip) = E5j8sek6uxmZLE+gbX/ldYqrtMRXgdfvMGxvV8p6cyE=
SIZE (ST4-4.1.jar) = 253043
-SIZE (ghidra-9.0.4.tar.gz) = 59223815
-SIZE (ghidra_9.0.4_PUBLIC_20190516.zip) = 298503610
+SIZE (ghidra-9.1.2.tar.gz) = 59623429
+SIZE (ghidra_9.1.2_PUBLIC_20200212.zip) = 302233568
SIZE
UPDATE: java/gradle 6.5.1
This updates Gradle to 6.5.1.
https://docs.gradle.org/6.5.1/release-notes.html
I have confirmed that security/ghidra builds with this Gradle update.
I have also tested this with my upcoming update of security/ghidra (to
Ghidra 9.1.2).
ok?
Index: Makefile
===
RCS file: /cvs/ports/java/gradle/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile19 Sep 2019 02:02:17 - 1.5
+++ Makefile5 Jul 2020 00:38:08 -
@@ -2,8 +2,7 @@
COMMENT = build automation tool
-DISTNAME = gradle-5.6.2
-REVISION = 0
+DISTNAME = gradle-6.5.1
EXTRACT_SUFX = -bin.zip
CATEGORIES = java
Index: distinfo
===
RCS file: /cvs/ports/java/gradle/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Sep 2019 02:16:40 - 1.4
+++ distinfo5 Jul 2020 00:41:27 -
@@ -1,2 +1,2 @@
-SHA256 (gradle-5.6.2-bin.zip) = MvzmYohI95mwrTIFro22fQ2CjBD/5it0inwNn0pdnuA=
-SIZE (gradle-5.6.2-bin.zip) = 93890597
+SHA256 (gradle-6.5.1-bin.zip) = UKfTBSn6k5ch/pJooCBRQvPyMCvKxftFsno5AuWNtUo=
+SIZE (gradle-6.5.1-bin.zip) = 102367135
Index: pkg/PLIST
===
RCS file: /cvs/ports/java/gradle/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 19 Sep 2019 02:02:17 - 1.5
+++ pkg/PLIST 30 Jun 2020 03:16:20 -
@@ -4,31 +4,34 @@ share/java/
share/java/gradle/
share/java/gradle/LICENSE
share/java/gradle/NOTICE
+share/java/gradle/README
share/java/gradle/bin/
share/java/gradle/bin/gradle
share/java/gradle/bin/gradle.bat
-share/java/gradle/getting-started.html
share/java/gradle/init.d/
share/java/gradle/init.d/readme.txt
share/java/gradle/lib/
share/java/gradle/lib/annotations-13.0.jar
-share/java/gradle/lib/ant-1.9.14.jar
-share/java/gradle/lib/ant-launcher-1.9.14.jar
-share/java/gradle/lib/asm-7.1.jar
-share/java/gradle/lib/asm-analysis-7.1.jar
-share/java/gradle/lib/asm-commons-7.1.jar
-share/java/gradle/lib/asm-tree-7.1.jar
-share/java/gradle/lib/commons-compress-1.18.jar
+share/java/gradle/lib/ant-1.10.7.jar
+share/java/gradle/lib/ant-launcher-1.10.7.jar
+share/java/gradle/lib/asm-7.3.1.jar
+share/java/gradle/lib/asm-analysis-7.3.1.jar
+share/java/gradle/lib/asm-commons-7.3.1.jar
+share/java/gradle/lib/asm-tree-7.3.1.jar
+share/java/gradle/lib/commons-compress-1.19.jar
share/java/gradle/lib/commons-io-2.6.jar
share/java/gradle/lib/commons-lang-2.6.jar
share/java/gradle/lib/failureaccess-1.0.1.jar
-share/java/gradle/lib/fastutil-8.2.1-min.jar
+share/java/gradle/lib/fastutil-8.3.0-min.jar
share/java/gradle/lib/gradle-api-metadata${GRADLE_JAR}
+share/java/gradle/lib/gradle-base-annotations${GRADLE_JAR}
share/java/gradle/lib/gradle-base-services${GRADLE_JAR}
share/java/gradle/lib/gradle-base-services-groovy${GRADLE_JAR}
share/java/gradle/lib/gradle-bootstrap${GRADLE_JAR}
share/java/gradle/lib/gradle-build-cache${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-cache-base${GRADLE_JAR}
share/java/gradle/lib/gradle-build-cache-packaging${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-events${GRADLE_JAR}
share/java/gradle/lib/gradle-build-option${GRADLE_JAR}
share/java/gradle/lib/gradle-cli${GRADLE_JAR}
share/java/gradle/lib/gradle-core${GRADLE_JAR}
@@ -36,10 +39,11 @@ share/java/gradle/lib/gradle-core-api${G
share/java/gradle/lib/gradle-docs${GRADLE_JAR}
share/java/gradle/lib/gradle-execution${GRADLE_JAR}
share/java/gradle/lib/gradle-file-collections${GRADLE_JAR}
+share/java/gradle/lib/gradle-file-watching${GRADLE_JAR}
share/java/gradle/lib/gradle-files${GRADLE_JAR}
share/java/gradle/lib/gradle-hashing${GRADLE_JAR}
share/java/gradle/lib/gradle-installation-beacon${GRADLE_JAR}
-share/java/gradle/lib/gradle-instant-execution${GRADLE_JAR}
+share/java/gradle/lib/gradle-java-compiler-plugin${GRADLE_JAR}
share/java/gradle/lib/gradle-jvm-services${GRADLE_JAR}
share/java/gradle/lib/gradle-kotlin-dsl${GRADLE_JAR}
share/java/gradle/lib/gradle-kotlin-dsl-tooling-models${GRADLE_JAR}
@@ -49,8 +53,8 @@ share/java/gradle/lib/gradle-messaging${
share/java/gradle/lib/gradle-model-core${GRADLE_JAR}
share/java/gradle/lib/gradle-model-groovy${GRADLE_JAR}
share/java/gradle/lib/gradle-native${GRADLE_JAR}
+share/java/gradle/lib/gradle-normalization-java${GRADLE_JAR}
share/java/gradle/lib/gradle-persistent-cache${GRADLE_JAR}
-share/java/gradle/lib/gradle-pineapple${GRADLE_JAR}
share/java/gradle/lib/gradle-process-services${GRADLE_JAR}
share/java/gradle/lib/gradle-resources${GRADLE_JAR}
share/java/gradle/lib/gradle-runtime-api-info${GRADLE_JAR}
@@ -58,45 +62,44 @@ share/java/gradle/lib/gradle-snapshots${
share/java/gradle/lib/gradle-tooling-api${GRADLE_JAR}
share/java/gradle/lib/gradle-worker-processes${GRADLE_JAR}
share/java/gradle/lib/gradle-wrapper${GRADLE_JAR}
-share/java/gradle/lib/groovy-all-1.3-2.5.4.jar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2020/05/26 20:32:10 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_decode_h patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in patch-src_preprocessors_Stream6_snort_stream_tcp_c net/snort/pkg : PLIST Log message: Update to Snort 2.9.16. Also includes a suggestion from sthen@ to use LIBTOOL_FLAGS=--tag=disable-static to remove static libraries which based on my tests are not needed by Snort. reads fine to maintainer Markus Lude
Re: UPDATE: net/snort 2.9.16
On Thu, May 21, 2020 at 11:06:19AM +0100, Stuart Henderson wrote:
> On 2020/05/18 23:52, Lawrence Teo wrote:
> > lib/pkgconfig/snort.pc
> > lib/snort_dynamicengine/
> > -lib/snort_dynamicengine/libsf_engine.a
> > +@static-lib lib/snort_dynamicengine/libsf_engine.a
> > @comment lib/snort_dynamicengine/libsf_engine.la
> > -lib/snort_dynamicengine/libsf_engine.so
> > +@so lib/snort_dynamicengine/libsf_engine.so
>
> Just noticed this in the diff - are these static libraries doing anything
> useful? These look like they should just be dlopen() modules which could
> be dropped with LIBTOOL_FLAGS=--tag=disable-static.
Thank you for the note. Here's a new diff that drops those static
libraries with the LIBTOOL_FLAGS you suggested. As far as I can tell
from my tests, those static libraries are not needed.
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile1 Dec 2019 03:19:10 - 1.106
+++ Makefile21 May 2020 20:55:49 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.15
-RULESV = 29150
+DISTNAME = snort-2.9.16
+RULESV = 29160
SUBST_VARS = RULESV
CATEGORIES = net security
@@ -24,6 +24,8 @@ SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-static-daq \
--enable-non-ether-decoders
+
+LIBTOOL_FLAGS =--tag=disable-static
LIB_DEPENDS = archivers/xz \
devel/pcre \
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo1 Dec 2019 03:19:10 - 1.42
+++ distinfo17 May 2020 01:14:58 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.15.tar.gz) = v7Q3dGRG73KgPFAdsTzW2l7dK0H1XIDEN7ooi+bafbo=
-SIZE (snort-2.9.15.tar.gz) = 6704763
+SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
+SIZE (snort-2.9.16.tar.gz) = 6948498
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_decode_h
--- patches/patch-src_decode_h 28 Jan 2018 03:09:12 - 1.11
+++ patches/patch-src_decode_h 17 May 2020 01:15:23 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.11 2018
Index: src/decode.h
--- src/decode.h.orig
+++ src/decode.h
-@@ -835,9 +835,9 @@ typedef struct _SLLHdr {
+@@ -837,9 +837,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.20
diff -u -p -r1.20 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 1 Dec 2019 03:19:10
- 1.20
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 17 May 2020 01:15:25
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/Makefile.in
--- src/dynamic-preprocessors/Makefile.in.orig
+++ src/dynamic-preprocessors/Makefile.in
-@@ -1647,19 +1647,8 @@ clean-local:
+@@ -1649,19 +1649,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
retrieving revision 1.17
diff -u -p -r1.17 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 1 Dec 2019
03:19:10 - 1.17
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 17 May 2020
01:15:27 -
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dcerpc2
@SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD = \
@SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
@SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
-@@ -608,7 +608,7 @@ distdir-am: $(DISTFILES)
+@@ -609,7 +609,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_dynamic-pre
Re: New: net/ruby-cbor
On Sun, May 17, 2020 at 12:37:43PM -0700, Jeremy Evans wrote: > This is a CBOR (Concise Binary Object Representation, RFC 7049) > implementation for Ruby. It's a dependency of the webauthn gem, > needed for implementing WebAuthn in Ruby. > > Tested on amd64. Looking for OKs to import. ok lteo@
UPDATE: net/snort 2.9.16
This updates Snort to 2.9.16.
https://blog.snort.org/2020/04/snort-29160-has-been-released.html
Upstream has a daq 2.0.7 release too, where the only change is the
addition of a daq.vcxproj file for 64-bit Windows. But their distfile
still ships with the configure script generated for daq-2.0.6, causing
the build to fail. I think they did not generate a new configure from
the 2.0.7 configure.ac.
However, for our purposes there is no functional change between
daq-2.0.6 and daq-2.0.7, so I did not spend too much time trying to make
it work since snort-2.9.16 builds and runs just fine with daq-2.0.6.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile1 Dec 2019 03:19:10 - 1.106
+++ Makefile19 May 2020 02:20:57 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.15
-RULESV = 29150
+DISTNAME = snort-2.9.16
+RULESV = 29160
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo1 Dec 2019 03:19:10 - 1.42
+++ distinfo17 May 2020 01:14:58 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.15.tar.gz) = v7Q3dGRG73KgPFAdsTzW2l7dK0H1XIDEN7ooi+bafbo=
-SIZE (snort-2.9.15.tar.gz) = 6704763
+SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
+SIZE (snort-2.9.16.tar.gz) = 6948498
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_decode_h
--- patches/patch-src_decode_h 28 Jan 2018 03:09:12 - 1.11
+++ patches/patch-src_decode_h 17 May 2020 01:15:23 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.11 2018
Index: src/decode.h
--- src/decode.h.orig
+++ src/decode.h
-@@ -835,9 +835,9 @@ typedef struct _SLLHdr {
+@@ -837,9 +837,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.20
diff -u -p -r1.20 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 1 Dec 2019 03:19:10
- 1.20
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 17 May 2020 01:15:25
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/Makefile.in
--- src/dynamic-preprocessors/Makefile.in.orig
+++ src/dynamic-preprocessors/Makefile.in
-@@ -1647,19 +1647,8 @@ clean-local:
+@@ -1649,19 +1649,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
retrieving revision 1.17
diff -u -p -r1.17 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 1 Dec 2019
03:19:10 - 1.17
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 17 May 2020
01:15:27 -
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dcerpc2
@SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD = \
@SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
@SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
-@@ -608,7 +608,7 @@ distdir-am: $(DISTFILES)
+@@ -609,7 +609,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in1 Dec 2019
03:19:10 - 1.15
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in17 May 2020
01:15:29 -
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dnp3/Ma
@SO_WITH_STATIC_LIB_TRUE@libsf_dnp3_preproc_la_LIBADD = \
@SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
@SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
-@@ -591,7 +591,7 @@ distdir-am: $(DISTFILES)
+@@ -592,7 +592,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/11/30 20:19:10 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_dynamic-plugins_sf_engine_Makefile_in patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_appid_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in patch-src_log_c patch-src_preprocessors_Stream6_snort_stream_tcp_c Log message: Update to Snort 2.9.15, from maintainer Markus Lude.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/10/21 20:09:18 Modified files: security/burpsuite: Makefile distinfo Log message: Update to Burp Suite 2.1.04. http://releases.portswigger.net/2019/09/professional-2104.html ok rpointel@
UPDATE: security/burpsuite 2.1.04
This updates burpsuite to 2.1.04.
http://releases.portswigger.net/2019/09/professional-2104.html
I've tested with both jdk 1.8 and 11.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/burpsuite/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile1 Aug 2019 02:32:23 - 1.31
+++ Makefile19 Oct 2019 02:03:30 -
@@ -2,7 +2,7 @@
COMMENT = tool for testing security of web applications
-VERSION = 2.1.02
+VERSION = 2.1.04
DISTNAME = burpsuite_free_v${VERSION}
PKGNAME = burpsuite-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/security/burpsuite/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo1 Aug 2019 02:32:23 - 1.25
+++ distinfo19 Oct 2019 02:04:30 -
@@ -1,2 +1,2 @@
-SHA256 (burpsuite_free_v2.1.02.jar) =
6awlN3D+cWq+6M0ZhUlNBl4u/QDfC0Mxh6/BvsUIpDI=
-SIZE (burpsuite_free_v2.1.02.jar) = 301105466
+SHA256 (burpsuite_free_v2.1.04.jar) =
eVzhBjj7KJFExogu8QxcEAfta0KLQWZ0VSZ7Ou+i+Os=
+SIZE (burpsuite_free_v2.1.04.jar) = 299887489
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/09/18 20:02:17 Modified files: java/gradle: Makefile java/gradle/pkg: PLIST Log message: Introduce a variable called GRADLE_JAR to replace the Gradle version number in the PLIST to make future PLIST diffs less noisy. suggested by and ok sthen@
Re: UPDATE: java/gradle 5.6.2
On Tue, Sep 17, 2019 at 02:37:48PM +0100, Stuart Henderson wrote:
> On 2019/09/16 22:13, Lawrence Teo wrote:
> > This updates Gradle to 5.6.2.
> >
> > https://docs.gradle.org/5.6.2/release-notes.html
> >
> > I have confirmed that security/ghidra builds with this Gradle update.
> >
> > To make future updates easier, this diff also adds myself as maintainer
> > since security/ghidra (which I currently maintain) is the only port that
> > uses Gradle right now.
> >
> > ok?
>
> OK.
>
> > +++ pkg/PLIST 15 Sep 2019 14:58:33 -
> > @@ -23,41 +23,41 @@ share/java/gradle/lib/commons-io-2.6.jar
> > share/java/gradle/lib/commons-lang-2.6.jar
> > share/java/gradle/lib/failureaccess-1.0.1.jar
> > share/java/gradle/lib/fastutil-8.2.1-min.jar
> > -share/java/gradle/lib/gradle-api-metadata-5.6.jar
> ..snip..
> > +share/java/gradle/lib/gradle-api-metadata-5.6.2.jar
>
> To make plist diffs a bit less noisy for future updates (which in turn
> makes it easier to notice what has changed), what do you think about
> using a variable to replace the gradle version number? You could do e.g.
>
> GRADLE_JAR= ${DISTNAME:S/gradle//}.jar
> SUBST_VARS+= GRADLE_JAR
>
> so for 5.6.2 GRADLE_JAR would be set to -5.6.2.jar (with the - and .jar
> literals to avoid a bogus match), and these plist entries would then
> look like [...]/lib/gradle-api-metadata${GRADLE_JAR}
> A
That sounds good to me. Here's the diff that makes that change.
ok?
Index: Makefile
===
RCS file: /cvs/ports/java/gradle/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile18 Sep 2019 02:16:40 - 1.4
+++ Makefile18 Sep 2019 02:34:25 -
@@ -3,6 +3,7 @@
COMMENT = build automation tool
DISTNAME = gradle-5.6.2
+REVISION = 0
EXTRACT_SUFX = -bin.zip
CATEGORIES = java
@@ -21,6 +22,9 @@ MODJAVA_VER = 1.8+
NO_BUILD = Yes
NO_TEST = Yes
+
+GRADLE_JAR = ${DISTNAME:S/gradle//}.jar
+SUBST_VARS += GRADLE_JAR
RUN_DEPENDS = java/javaPathHelper
Index: pkg/PLIST
===
RCS file: /cvs/ports/java/gradle/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 18 Sep 2019 02:16:40 - 1.4
+++ pkg/PLIST 18 Sep 2019 02:34:25 -
@@ -23,41 +23,41 @@ share/java/gradle/lib/commons-io-2.6.jar
share/java/gradle/lib/commons-lang-2.6.jar
share/java/gradle/lib/failureaccess-1.0.1.jar
share/java/gradle/lib/fastutil-8.2.1-min.jar
-share/java/gradle/lib/gradle-api-metadata-5.6.2.jar
-share/java/gradle/lib/gradle-base-services-5.6.2.jar
-share/java/gradle/lib/gradle-base-services-groovy-5.6.2.jar
-share/java/gradle/lib/gradle-bootstrap-5.6.2.jar
-share/java/gradle/lib/gradle-build-cache-5.6.2.jar
-share/java/gradle/lib/gradle-build-cache-packaging-5.6.2.jar
-share/java/gradle/lib/gradle-build-option-5.6.2.jar
-share/java/gradle/lib/gradle-cli-5.6.2.jar
-share/java/gradle/lib/gradle-core-5.6.2.jar
-share/java/gradle/lib/gradle-core-api-5.6.2.jar
-share/java/gradle/lib/gradle-docs-5.6.2.jar
-share/java/gradle/lib/gradle-execution-5.6.2.jar
-share/java/gradle/lib/gradle-file-collections-5.6.2.jar
-share/java/gradle/lib/gradle-files-5.6.2.jar
-share/java/gradle/lib/gradle-hashing-5.6.2.jar
-share/java/gradle/lib/gradle-installation-beacon-5.6.2.jar
-share/java/gradle/lib/gradle-instant-execution-5.6.2.jar
-share/java/gradle/lib/gradle-jvm-services-5.6.2.jar
-share/java/gradle/lib/gradle-kotlin-dsl-5.6.2.jar
-share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.6.2.jar
-share/java/gradle/lib/gradle-launcher-5.6.2.jar
-share/java/gradle/lib/gradle-logging-5.6.2.jar
-share/java/gradle/lib/gradle-messaging-5.6.2.jar
-share/java/gradle/lib/gradle-model-core-5.6.2.jar
-share/java/gradle/lib/gradle-model-groovy-5.6.2.jar
-share/java/gradle/lib/gradle-native-5.6.2.jar
-share/java/gradle/lib/gradle-persistent-cache-5.6.2.jar
-share/java/gradle/lib/gradle-pineapple-5.6.2.jar
-share/java/gradle/lib/gradle-process-services-5.6.2.jar
-share/java/gradle/lib/gradle-resources-5.6.2.jar
-share/java/gradle/lib/gradle-runtime-api-info-5.6.2.jar
-share/java/gradle/lib/gradle-snapshots-5.6.2.jar
-share/java/gradle/lib/gradle-tooling-api-5.6.2.jar
-share/java/gradle/lib/gradle-worker-processes-5.6.2.jar
-share/java/gradle/lib/gradle-wrapper-5.6.2.jar
+share/java/gradle/lib/gradle-api-metadata${GRADLE_JAR}
+share/java/gradle/lib/gradle-base-services${GRADLE_JAR}
+share/java/gradle/lib/gradle-base-services-groovy${GRADLE_JAR}
+share/java/gradle/lib/gradle-bootstrap${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-cache${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-cache-packaging${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-option${GRADLE_JAR}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/09/17 20:16:40 Modified files: java/gradle: Makefile distinfo java/gradle/pkg: PLIST Log message: Update to Gradle 5.6.2. https://docs.gradle.org/5.6.2/release-notes.html ok abieber@ rpointel@ sthen@
UPDATE: java/gradle 5.6.2
This updates Gradle to 5.6.2. https://docs.gradle.org/5.6.2/release-notes.html I have confirmed that security/ghidra builds with this Gradle update. To make future updates easier, this diff also adds myself as maintainer since security/ghidra (which I currently maintain) is the only port that uses Gradle right now. ok? Index: Makefile === RCS file: /cvs/ports/java/gradle/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile19 Aug 2019 02:29:34 - 1.3 +++ Makefile15 Sep 2019 14:51:19 - @@ -2,12 +2,14 @@ COMMENT = build automation tool -DISTNAME = gradle-5.6 +DISTNAME = gradle-5.6.2 EXTRACT_SUFX = -bin.zip CATEGORIES = java HOMEPAGE = https://gradle.org/ + +MAINTAINER = Lawrence Teo # Apache 2.0 PERMIT_PACKAGE = Yes Index: distinfo === RCS file: /cvs/ports/java/gradle/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo19 Aug 2019 02:29:34 - 1.3 +++ distinfo15 Sep 2019 14:54:54 - @@ -1,2 +1,2 @@ -SHA256 (gradle-5.6-bin.zip) = FcAu9d02MewCrFLoclcD4Chdmn7sv05ZOaqekkYE0B0= -SIZE (gradle-5.6-bin.zip) = 93883485 +SHA256 (gradle-5.6.2-bin.zip) = MvzmYohI95mwrTIFro22fQ2CjBD/5it0inwNn0pdnuA= +SIZE (gradle-5.6.2-bin.zip) = 93890597 Index: pkg/PLIST === RCS file: /cvs/ports/java/gradle/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 19 Aug 2019 02:29:34 - 1.3 +++ pkg/PLIST 15 Sep 2019 14:58:33 - @@ -23,41 +23,41 @@ share/java/gradle/lib/commons-io-2.6.jar share/java/gradle/lib/commons-lang-2.6.jar share/java/gradle/lib/failureaccess-1.0.1.jar share/java/gradle/lib/fastutil-8.2.1-min.jar -share/java/gradle/lib/gradle-api-metadata-5.6.jar -share/java/gradle/lib/gradle-base-services-5.6.jar -share/java/gradle/lib/gradle-base-services-groovy-5.6.jar -share/java/gradle/lib/gradle-bootstrap-5.6.jar -share/java/gradle/lib/gradle-build-cache-5.6.jar -share/java/gradle/lib/gradle-build-cache-packaging-5.6.jar -share/java/gradle/lib/gradle-build-option-5.6.jar -share/java/gradle/lib/gradle-cli-5.6.jar -share/java/gradle/lib/gradle-core-5.6.jar -share/java/gradle/lib/gradle-core-api-5.6.jar -share/java/gradle/lib/gradle-docs-5.6.jar -share/java/gradle/lib/gradle-execution-5.6.jar -share/java/gradle/lib/gradle-file-collections-5.6.jar -share/java/gradle/lib/gradle-files-5.6.jar -share/java/gradle/lib/gradle-hashing-5.6.jar -share/java/gradle/lib/gradle-installation-beacon-5.6.jar -share/java/gradle/lib/gradle-instant-execution-5.6.jar -share/java/gradle/lib/gradle-jvm-services-5.6.jar -share/java/gradle/lib/gradle-kotlin-dsl-5.6.jar -share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.6.jar -share/java/gradle/lib/gradle-launcher-5.6.jar -share/java/gradle/lib/gradle-logging-5.6.jar -share/java/gradle/lib/gradle-messaging-5.6.jar -share/java/gradle/lib/gradle-model-core-5.6.jar -share/java/gradle/lib/gradle-model-groovy-5.6.jar -share/java/gradle/lib/gradle-native-5.6.jar -share/java/gradle/lib/gradle-persistent-cache-5.6.jar -share/java/gradle/lib/gradle-pineapple-5.6.jar -share/java/gradle/lib/gradle-process-services-5.6.jar -share/java/gradle/lib/gradle-resources-5.6.jar -share/java/gradle/lib/gradle-runtime-api-info-5.6.jar -share/java/gradle/lib/gradle-snapshots-5.6.jar -share/java/gradle/lib/gradle-tooling-api-5.6.jar -share/java/gradle/lib/gradle-worker-processes-5.6.jar -share/java/gradle/lib/gradle-wrapper-5.6.jar +share/java/gradle/lib/gradle-api-metadata-5.6.2.jar +share/java/gradle/lib/gradle-base-services-5.6.2.jar +share/java/gradle/lib/gradle-base-services-groovy-5.6.2.jar +share/java/gradle/lib/gradle-bootstrap-5.6.2.jar +share/java/gradle/lib/gradle-build-cache-5.6.2.jar +share/java/gradle/lib/gradle-build-cache-packaging-5.6.2.jar +share/java/gradle/lib/gradle-build-option-5.6.2.jar +share/java/gradle/lib/gradle-cli-5.6.2.jar +share/java/gradle/lib/gradle-core-5.6.2.jar +share/java/gradle/lib/gradle-core-api-5.6.2.jar +share/java/gradle/lib/gradle-docs-5.6.2.jar +share/java/gradle/lib/gradle-execution-5.6.2.jar +share/java/gradle/lib/gradle-file-collections-5.6.2.jar +share/java/gradle/lib/gradle-files-5.6.2.jar +share/java/gradle/lib/gradle-hashing-5.6.2.jar +share/java/gradle/lib/gradle-installation-beacon-5.6.2.jar +share/java/gradle/lib/gradle-instant-execution-5.6.2.jar +share/java/gradle/lib/gradle-jvm-services-5.6.2.jar +share/java/gradle/lib/gradle-kotlin-dsl-5.6.2.jar +share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.6.2.jar +share/java/gradle/lib/gradle-launcher-5.6.2.jar +share/java/gradle/lib/gradle-logging-5.6.2.jar +share/java/gradle/lib/gradle-messaging-5.6.2.jar +share/java/gradle/lib/gradle-model-core-5.6.2.jar +share/java/gradle/lib/gradle-model-groovy-5.6.2.jar +share/java/gradle/lib/gradle-native-5.6.2.jar +share/java
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: l...@cvs.openbsd.org2019/09/11 20:10:07
Modified files:
security/ghidra: Makefile
security/ghidra/patches: patch-GPL_nativeBuildProperties_gradle
Log message:
Ghidra's build system prefers g++ over clang, which is not what we want on a
clang-based platform like amd64. This commit makes Ghidra build with clang by:
* Adding a clang toolChains block in nativeBuildProperties.gradle
* Adding COMPILER="base-clang ports-clang"
* Updating WANTLIB by replacing libstdc++ with ${COMPILER_LIBCXX}
In addition, honor CXX by setting tools.cppCompiler.executable and
tools.linker.executable in nativeBuildProperties.gradle to ${CXX}. Also print
those variables so that we can confirm that they are set properly.
Lastly, add --stacktrace to the gradle command to facilitate future debugging.
Thanks to daniel@ for bringing this to my attention, naddy@ for his detailed
report of the g++ and CXX issues, and sthen@ for suggesting a possible fix.
ok naddy@ sthen@
Re: security/ghidra and libstdc++
On Fri, Aug 30, 2019 at 12:33:37AM -0400, Lawrence Teo wrote:
> On Wed, Aug 28, 2019 at 10:17:29PM -0400, Lawrence Teo wrote:
> > On Tue, Aug 27, 2019 at 10:52:52AM -, Christian Weisgerber wrote:
> > > On 2019-08-21, Stuart Henderson wrote:
> > >
> > > >> > * If you build ghidra on a system where gcc/g++/libstdc++ are
> > > >> > available, it does indeed link something against libstdc++ and
> > > >> > port-lib-depends-check indicates WANTLIB+=stdc++.
> > > >> >
> > > >> > * If you build ghidra on a system where gcc/g++/libstdc++ are NOT
> > > >> > available, it still builds fine, something is linked against
> > > >> > libc++/libc++abi/pthread and port-lib-depends-check consequently
> > > >> > indicates WANTLIB+=${COMPILER_LIBCXX}.
> > > >
> > > > Is this enough? Untested beyond "does it create the right symlink".
> > > >
> > > > --- Makefile12 Jul 2019 20:49:02 - 1.4
> > > > +++ Makefile21 Aug 2019 08:21:22 -
> > > > @@ -39,6 +39,7 @@ post-extract:
> > > > ${WRKSRC}/ghidraRun
> > > > @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
> > > > ${WRKSRC}/support/launch.sh
> > > > + ln -s c++ ${WRKDIR}/bin/g++
> > >
> > > This actually breaks the build:
> > >
> > > > Task :Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp FAILED
> > >
> > > FAILURE: Build failed with an exception.
> > >
> > > * What went wrong:
> > > Execution failed for task
> > > ':Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp'.
> > > > java.lang.NullPointerException (no error message)
> >
> > I have been testing and tinkering as well but haven't gotten very far.
> > Using sthen's diff and passing --stacktrace to gradle I got this output:
> [snip]
> >
> > That looks like something related to Gradle, so I did some digging in
> > the *.gradle files in the Ghidra source tree. I believe the file that
> > needs to be fixed is
> > ghidra-9.0.4/ghidra-Ghidra_9.0.4_build/GPL/nativeBuildProperties.gradle
> > but I haven't figured out exactly how yet.
>
> I think I got it. This new diff tells Gradle to build the demangler
> with Clang, and I also made it print the compiler and linker
> executables to confirm:
>
> C++ compiler is [clang++]
> Linker is [clang++]
>
> The resulting demangler_gnu is linked with libc++:
>
> nori$ ldd
> /usr/local/share/java/ghidra/GPL/DemanglerGnu/os/openbsd64/demangler_gnu
> /usr/local/share/java/ghidra/GPL/DemanglerGnu/os/openbsd64/demangler_gnu:
> StartEnd Type Open Ref GrpRef Name
> 05b4d7026000 05b4d7056000 exe 20 0
> /usr/local/share/java/ghidra/GPL/DemanglerGnu/os/openbsd64/demangler_gnu
> 05b73bfaa000 05b73c086000 rlib 01 0
> /usr/lib/libc++.so.3.0
> 05b7588a8000 05b7588ea000 rlib 02 0
> /usr/lib/libc++abi.so.1.0
> 05b6e100b000 05b6e1018000 rlib 01 0
> /usr/lib/libpthread.so.26.1
> 05b6d8f74000 05b6d8fa3000 rlib 01 0
> /usr/lib/libm.so.10.1
> 05b75bb5c000 05b75bc5 rlib 01 0
> /usr/lib/libc.so.95.1
> 05b79c817000 05b79c817000 ld.so 01 0
> /usr/libexec/ld.so
>
> I added --stacktrace to gradle's command line for easier future
> debugging.
>
> Tests/feedback welcome!
Here's a new diff that makes the port honor CXX. I also added
COMPILER="base-clang ports-clang" and confirmed that it builds with both
clangs.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile23 Jul 2019 02:52:58 - 1.6
+++ Makefile7 Sep 2019 02:18:06 -
@@ -7,7 +7,7 @@ COMMENT = software reverse engineering (
VERSION = 9.0.4
GHIDRA_DATE = 20190516
-REVISION = 2
+REVISION = 3
GH_ACCOUNT = NationalSecurityAgency
GH_PROJECT = ghidra
@@ -23,7 +23,7 @@ MAINTAINER = Lawrence Teo https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
@@ -55,6 +55,8 @@ DISTFILES += ${JAR_DISTFILES:C/$/:2/}
EXTRACT_ONLY = ${DISTNAME}.tar.gz
+COMPILER = base-clang ports-clang
+
MODULES = java
MODJAVA_VER = 11+
@@ -68,7 +70,7 @@ RUN_DEPENDS = shells/bash \
NO_TEST =
Re: security/ghidra and libstdc++
On Wed, Aug 28, 2019 at 10:17:29PM -0400, Lawrence Teo wrote:
> On Tue, Aug 27, 2019 at 10:52:52AM -, Christian Weisgerber wrote:
> > On 2019-08-21, Stuart Henderson wrote:
> >
> > >> > * If you build ghidra on a system where gcc/g++/libstdc++ are
> > >> > available, it does indeed link something against libstdc++ and
> > >> > port-lib-depends-check indicates WANTLIB+=stdc++.
> > >> >
> > >> > * If you build ghidra on a system where gcc/g++/libstdc++ are NOT
> > >> > available, it still builds fine, something is linked against
> > >> > libc++/libc++abi/pthread and port-lib-depends-check consequently
> > >> > indicates WANTLIB+=${COMPILER_LIBCXX}.
> > >
> > > Is this enough? Untested beyond "does it create the right symlink".
> > >
> > > --- Makefile 12 Jul 2019 20:49:02 - 1.4
> > > +++ Makefile 21 Aug 2019 08:21:22 -
> > > @@ -39,6 +39,7 @@ post-extract:
> > > ${WRKSRC}/ghidraRun
> > > @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
> > > ${WRKSRC}/support/launch.sh
> > > + ln -s c++ ${WRKDIR}/bin/g++
> >
> > This actually breaks the build:
> >
> > > Task :Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp FAILED
> >
> > FAILURE: Build failed with an exception.
> >
> > * What went wrong:
> > Execution failed for task
> > ':Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp'.
> > > java.lang.NullPointerException (no error message)
>
> I have been testing and tinkering as well but haven't gotten very far.
> Using sthen's diff and passing --stacktrace to gradle I got this output:
[snip]
>
> That looks like something related to Gradle, so I did some digging in
> the *.gradle files in the Ghidra source tree. I believe the file that
> needs to be fixed is
> ghidra-9.0.4/ghidra-Ghidra_9.0.4_build/GPL/nativeBuildProperties.gradle
> but I haven't figured out exactly how yet.
I think I got it. This new diff tells Gradle to build the demangler
with Clang, and I also made it print the compiler and linker
executables to confirm:
C++ compiler is [clang++]
Linker is [clang++]
The resulting demangler_gnu is linked with libc++:
nori$ ldd
/usr/local/share/java/ghidra/GPL/DemanglerGnu/os/openbsd64/demangler_gnu
/usr/local/share/java/ghidra/GPL/DemanglerGnu/os/openbsd64/demangler_gnu:
StartEnd Type Open Ref GrpRef Name
05b4d7026000 05b4d7056000 exe 20 0
/usr/local/share/java/ghidra/GPL/DemanglerGnu/os/openbsd64/demangler_gnu
05b73bfaa000 05b73c086000 rlib 01 0
/usr/lib/libc++.so.3.0
05b7588a8000 05b7588ea000 rlib 02 0
/usr/lib/libc++abi.so.1.0
05b6e100b000 05b6e1018000 rlib 01 0
/usr/lib/libpthread.so.26.1
05b6d8f74000 05b6d8fa3000 rlib 01 0
/usr/lib/libm.so.10.1
05b75bb5c000 05b75bc5 rlib 01 0
/usr/lib/libc.so.95.1
05b79c817000 05b79c817000 ld.so 01 0
/usr/libexec/ld.so
I added --stacktrace to gradle's command line for easier future
debugging.
Tests/feedback welcome!
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 23 Jul 2019 02:52:58 - 1.6
+++ Makefile30 Aug 2019 03:27:26 -
@@ -7,7 +7,7 @@ COMMENT = software reverse engineering (
VERSION = 9.0.4
GHIDRA_DATE = 20190516
-REVISION = 2
+REVISION = 3
GH_ACCOUNT = NationalSecurityAgency
GH_PROJECT = ghidra
@@ -23,7 +23,7 @@ MAINTAINER = Lawrence Teo https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
@@ -113,11 +113,13 @@ pre-build:
cp ${DISTDIR}/yajsw-stable-${YAJSW_VER}.zip \
${WRKDIR}/ghidra.bin/Ghidra/Features/GhidraServer
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle -g ${WRKDIR}/gradle \
- --no-daemon --offline -I ${WRKDIR}/repos.gradle yajswDevUnpack
+ --no-daemon --offline --stacktrace -I ${WRKDIR}/repos.gradle \
+ yajswDevUnpack
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle -g ${WRKDIR}/gradle \
- --no-daemon --offline -I ${WRKDIR}/repos.gradle buildGhidra
+ --no-daemon --offline --stacktrace -I ${WRKDIR}/repos.gradle \
+ buildGhidra
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/java
Index: patches/patch-GPL_nativeBuildProperties_gradle
===
RCS file
Re: UPDATE: net/snort 2.9.14.1
Thanks for the ping! I have tested and committed your diff.
On Wed, Aug 28, 2019 at 10:40:31PM +0200, Markus Lude wrote:
> ping
>
> On Sun, Aug 18, 2019 at 12:46:31PM +0200, Markus Lude wrote:
> > Hello,
> >
> > attached is an update to snort 2.9.14.1.
> >
> > Tested on amd64.
> >
> > Please test, comment and eventually commit.
> >
> > Regards
> > Markus
> >
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/snort/Makefile,v
> > retrieving revision 1.104
> > diff -u -p -u -p -r1.104 Makefile
> > --- Makefile24 Jul 2019 02:15:57 - 1.104
> > +++ Makefile18 Aug 2019 10:41:39 -
> > @@ -2,8 +2,8 @@
> >
> > COMMENT = highly flexible sniffer/NIDS
> >
> > -DISTNAME = snort-2.9.14
> > -RULESV = 29140
> > +DISTNAME = snort-2.9.14.1
> > +RULESV = 29141
> > SUBST_VARS = RULESV
> >
> > CATEGORIES = net security
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/net/snort/distinfo,v
> > retrieving revision 1.40
> > diff -u -p -u -p -r1.40 distinfo
> > --- distinfo24 Jul 2019 02:15:57 - 1.40
> > +++ distinfo18 Aug 2019 10:41:39 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (snort-2.9.14.tar.gz) = wDBtuc5k9FzHxkya/HCr6WidqoYAIDRew7oJmSi3Rks=
> > -SIZE (snort-2.9.14.tar.gz) = 6688482
> > +SHA256 (snort-2.9.14.1.tar.gz) =
> > JHKYnaOqzgANHqWTHs5o+OXMDFEeJy1lGCETokgegi0=
> > +SIZE (snort-2.9.14.1.tar.gz) = 6531749
> > Index: patches/patch-src_dynamic-plugins_sf_engine_Makefile_in
> > ===
> > RCS file:
> > /cvs/ports/net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in,v
> > retrieving revision 1.12
> > diff -u -p -u -p -r1.12 patch-src_dynamic-plugins_sf_engine_Makefile_in
> > --- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 2 Jun 2019
> > 02:07:44 - 1.12
> > +++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 18 Aug 2019
> > 10:41:39 -
> > @@ -5,7 +5,7 @@ Disable libsf_sorules in the examples di
> > Index: src/dynamic-plugins/sf_engine/Makefile.in
> > --- src/dynamic-plugins/sf_engine/Makefile.in.orig
> > +++ src/dynamic-plugins/sf_engine/Makefile.in
> > -@@ -388,7 +388,7 @@ top_srcdir = @top_srcdir@
> > +@@ -376,7 +376,7 @@ top_srcdir = @top_srcdir@
> > AUTOMAKE_OPTIONS = foreign no-dependencies
> > dynamicengine_LTLIBRARIES = libsf_engine.la
> > dynamicenginedir = $(libdir)/snort_dynamicengine
> > @@ -14,7 +14,7 @@ Index: src/dynamic-plugins/sf_engine/Mak
> > @BUILD_OPENSSL_MD5_TRUE@OPENSSL_MD5 = \
> > @BUILD_OPENSSL_MD5_TRUE@md5.c md5.h
> >
> > -@@ -529,7 +529,7 @@ massage_ipv6_headers = \
> > +@@ -517,7 +517,7 @@ massage_ipv6_headers = \
> > $(sed_ipv6_headers); \
> > fi
> >
> > Index: patches/patch-src_dynamic-preprocessors_Makefile_in
> > ===
> > RCS file:
> > /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
> > retrieving revision 1.18
> > diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_Makefile_in
> > --- patches/patch-src_dynamic-preprocessors_Makefile_in 2 Jun 2019
> > 02:07:44 - 1.18
> > +++ patches/patch-src_dynamic-preprocessors_Makefile_in 18 Aug 2019
> > 10:41:39 -
> > @@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
> > Index: src/dynamic-preprocessors/Makefile.in
> > --- src/dynamic-preprocessors/Makefile.in.orig
> > +++ src/dynamic-preprocessors/Makefile.in
> > -@@ -1647,19 +1647,8 @@ clean-local:
> > +@@ -1631,19 +1631,8 @@ clean-local:
> > rm -rf include build
> >
> > install-data-local:
> > Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
> > ===
> > RCS file:
> > /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_appid_Makefile_in,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 patch-src_dynamic-preprocessors_appid_Makefile_in
> > --- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 24 Jul
> > 2019 02:15:57 - 1.3
> > +++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 18 Aug
> > 2019 10:41:39 -
> > @@ -6,7 +6,7 @@ libunwind symbols.
> > Index: src/dynamic-preprocessors/appid/Makefile.in
> > --- src/dynamic-preprocessors/appid/Makefile.in.orig
> > +++ src/dynamic-preprocessors/appid/Makefile.in
> > -@@ -586,8 +586,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
> > +@@ -575,8 +575,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
> > $(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
> > dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> > dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
> > Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/08/28 20:47:15 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_dynamic-plugins_sf_engine_Makefile_in patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_appid_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in Log message: Update to Snort 2.9.14.1, from maintainer Markus Lude.
Re: security/ghidra and libstdc++
On Tue, Aug 27, 2019 at 10:52:52AM -, Christian Weisgerber wrote:
> On 2019-08-21, Stuart Henderson wrote:
>
> >> > * If you build ghidra on a system where gcc/g++/libstdc++ are
> >> > available, it does indeed link something against libstdc++ and
> >> > port-lib-depends-check indicates WANTLIB+=stdc++.
> >> >
> >> > * If you build ghidra on a system where gcc/g++/libstdc++ are NOT
> >> > available, it still builds fine, something is linked against
> >> > libc++/libc++abi/pthread and port-lib-depends-check consequently
> >> > indicates WANTLIB+=${COMPILER_LIBCXX}.
> >
> > Is this enough? Untested beyond "does it create the right symlink".
> >
> > --- Makefile12 Jul 2019 20:49:02 - 1.4
> > +++ Makefile21 Aug 2019 08:21:22 -
> > @@ -39,6 +39,7 @@ post-extract:
> > ${WRKSRC}/ghidraRun
> > @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
> > ${WRKSRC}/support/launch.sh
> > + ln -s c++ ${WRKDIR}/bin/g++
>
> This actually breaks the build:
>
> > Task :Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp FAILED
>
> FAILURE: Build failed with an exception.
>
> * What went wrong:
> Execution failed for task
> ':Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp'.
> > java.lang.NullPointerException (no error message)
I have been testing and tinkering as well but haven't gotten very far.
Using sthen's diff and passing --stacktrace to gradle I got this output:
FAILURE: Build failed with an exception.
* What went wrong:
Execution failed for task
':Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp'.
> java.lang.NullPointerException (no error message)
* Try:
Run with --info or --debug option to get more log output. Run with --scan to
get full insights.
* Exception is:
org.gradle.api.tasks.TaskExecutionException: Execution failed for task
':Decompiler:compileDecompileOpenbsd64ExecutableDecompileCpp'.
at
org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:38)
at
org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.executeTask(EventFiringTaskExecuter.java:77)
at
org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.call(EventFiringTaskExecuter.java:55)
at
org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.call(EventFiringTaskExecuter.java:52)
at
org.gradle.internal.operations.DefaultBuildOperationExecutor$CallableBuildOperationWorker.execute(DefaultBuildOperationExecutor.java:416)
at
org.gradle.internal.operations.DefaultBuildOperationExecutor$CallableBuildOperationWorker.execute(DefaultBuildOperationExecutor.java:406)
at
org.gradle.internal.operations.DefaultBuildOperationExecutor$1.execute(DefaultBuildOperationExecutor.java:165)
at
org.gradle.internal.operations.DefaultBuildOperationExecutor.execute(DefaultBuildOperationExecutor.java:250)
at
org.gradle.internal.operations.DefaultBuildOperationExecutor.execute(DefaultBuildOperationExecutor.java:158)
at
org.gradle.internal.operations.DefaultBuildOperationExecutor.call(DefaultBuildOperationExecutor.java:102)
at
org.gradle.internal.operations.DelegatingBuildOperationExecutor.call(DelegatingBuildOperationExecutor.java:36)
at
org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter.execute(EventFiringTaskExecuter.java:52)
at
org.gradle.execution.plan.LocalTaskNodeExecutor.execute(LocalTaskNodeExecutor.java:43)
at
org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$InvokeNodeExecutorsAction.execute(DefaultTaskExecutionGraph.java:355)
at
org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$InvokeNodeExecutorsAction.execute(DefaultTaskExecutionGraph.java:343)
at
org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$BuildOperationAwareExecutionAction.execute(DefaultTaskExecutionGraph.java:336)
at
org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$BuildOperationAwareExecutionAction.execute(DefaultTaskExecutionGraph.java:322)
at
org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker$1.execute(DefaultPlanExecutor.java:134)
at
org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker$1.execute(DefaultPlanExecutor.java:129)
at
org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker.execute(DefaultPlanExecutor.java:202)
at
org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker.executeNextNode(DefaultPlanExecutor.java:193)
at
org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker.run(DefaultPlanExecutor.java:129)
at
org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
at
org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
at
org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
Re: security/ghidra and libstdc++
On Tue, Aug 20, 2019 at 04:32:48PM +0200, Christian Weisgerber wrote:
> A few days ago, I did a test bulk build on amd64 with gcc, g++, and
> libstdc++ removed from the system. Ports should not use these any
> longer on clang platforms.
>
> security/ghidra failed to build right away since it has stdc++ in
> WANTLIB. Further testing shows:
>
> * If you build ghidra on a system where gcc/g++/libstdc++ are
> available, it does indeed link something against libstdc++ and
> port-lib-depends-check indicates WANTLIB+=stdc++.
>
> * If you build ghidra on a system where gcc/g++/libstdc++ are NOT
> available, it still builds fine, something is linked against
> libc++/libc++abi/pthread and port-lib-depends-check consequently
> indicates WANTLIB+=${COMPILER_LIBCXX}.
>
> There must be some magic in the build where it first tries to use
> g++ and falls back to c++. Unfortunately, the actual build commands
> are hidden and the build is run by some Java tool, so it's not
> obvious what's going on.
>
> The port should honor CXX or at least not use g++. Maybe Lawrence
> or somebody else can take a look...
>
> --
> Christian "naddy" Weisgerber na...@mips.inka.de
I took a look, and you're right that it's not obvious at all.
I'm not familiar with that part of the build process so I'll have a lot
of poking around to do. :) My current suspect is a hardcoded "g++"
inside jython-standalone-2.7.1.jar.
If someone else wants to look around as well, help is very welcome!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/08/18 20:29:34 Modified files: java/gradle: Makefile distinfo java/gradle/pkg: PLIST Log message: Update to Gradle 5.6 https://docs.gradle.org/5.6/release-notes.html ok rsadowski@
UPDATE: java/gradle 5.6
This updates Gradle to 5.6. https://docs.gradle.org/5.6/release-notes.html I confirmed that security/ghidra builds successfully with this Gradle update. ok? Index: Makefile === RCS file: /cvs/ports/java/gradle/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile19 Jul 2019 02:22:31 - 1.2 +++ Makefile16 Aug 2019 02:19:46 - @@ -2,7 +2,7 @@ COMMENT = build automation tool -DISTNAME = gradle-5.5.1 +DISTNAME = gradle-5.6 EXTRACT_SUFX = -bin.zip CATEGORIES = java Index: distinfo === RCS file: /cvs/ports/java/gradle/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo19 Jul 2019 02:22:31 - 1.2 +++ distinfo16 Aug 2019 02:22:59 - @@ -1,2 +1,2 @@ -SHA256 (gradle-5.5.1-bin.zip) = IioD/PL8rzaRdnzpVJ9469SnfnP54jo5aJn7cLQgzQA= -SIZE (gradle-5.5.1-bin.zip) = 89152247 +SHA256 (gradle-5.6-bin.zip) = FcAu9d02MewCrFLoclcD4Chdmn7sv05ZOaqekkYE0B0= +SIZE (gradle-5.6-bin.zip) = 93883485 Index: pkg/PLIST === RCS file: /cvs/ports/java/gradle/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 19 Jul 2019 02:22:31 - 1.2 +++ pkg/PLIST 16 Aug 2019 02:25:45 - @@ -14,81 +14,89 @@ share/java/gradle/lib/ share/java/gradle/lib/annotations-13.0.jar share/java/gradle/lib/ant-1.9.14.jar share/java/gradle/lib/ant-launcher-1.9.14.jar -share/java/gradle/lib/asm-7.0.jar -share/java/gradle/lib/asm-analysis-7.0.jar -share/java/gradle/lib/asm-commons-7.0.jar -share/java/gradle/lib/asm-tree-7.0.jar +share/java/gradle/lib/asm-7.1.jar +share/java/gradle/lib/asm-analysis-7.1.jar +share/java/gradle/lib/asm-commons-7.1.jar +share/java/gradle/lib/asm-tree-7.1.jar share/java/gradle/lib/commons-compress-1.18.jar share/java/gradle/lib/commons-io-2.6.jar share/java/gradle/lib/commons-lang-2.6.jar share/java/gradle/lib/failureaccess-1.0.1.jar share/java/gradle/lib/fastutil-8.2.1-min.jar -share/java/gradle/lib/gradle-api-metadata-5.5.1.jar -share/java/gradle/lib/gradle-base-services-5.5.1.jar -share/java/gradle/lib/gradle-base-services-groovy-5.5.1.jar -share/java/gradle/lib/gradle-build-cache-5.5.1.jar -share/java/gradle/lib/gradle-build-cache-packaging-5.5.1.jar -share/java/gradle/lib/gradle-build-option-5.5.1.jar -share/java/gradle/lib/gradle-cli-5.5.1.jar -share/java/gradle/lib/gradle-core-5.5.1.jar -share/java/gradle/lib/gradle-core-api-5.5.1.jar -share/java/gradle/lib/gradle-docs-5.5.1.jar -share/java/gradle/lib/gradle-execution-5.5.1.jar -share/java/gradle/lib/gradle-files-5.5.1.jar -share/java/gradle/lib/gradle-installation-beacon-5.5.1.jar -share/java/gradle/lib/gradle-instant-execution-5.5.1.jar -share/java/gradle/lib/gradle-jvm-services-5.5.1.jar -share/java/gradle/lib/gradle-kotlin-dsl-5.5.1.jar -share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.5.1.jar -share/java/gradle/lib/gradle-launcher-5.5.1.jar -share/java/gradle/lib/gradle-logging-5.5.1.jar -share/java/gradle/lib/gradle-messaging-5.5.1.jar -share/java/gradle/lib/gradle-model-core-5.5.1.jar -share/java/gradle/lib/gradle-model-groovy-5.5.1.jar -share/java/gradle/lib/gradle-native-5.5.1.jar -share/java/gradle/lib/gradle-persistent-cache-5.5.1.jar -share/java/gradle/lib/gradle-process-services-5.5.1.jar -share/java/gradle/lib/gradle-resources-5.5.1.jar -share/java/gradle/lib/gradle-runtime-api-info-5.5.1.jar -share/java/gradle/lib/gradle-snapshots-5.5.1.jar -share/java/gradle/lib/gradle-tooling-api-5.5.1.jar -share/java/gradle/lib/gradle-wrapper-5.5.1.jar -share/java/gradle/lib/groovy-all-1.0-2.5.4.jar +share/java/gradle/lib/gradle-api-metadata-5.6.jar +share/java/gradle/lib/gradle-base-services-5.6.jar +share/java/gradle/lib/gradle-base-services-groovy-5.6.jar +share/java/gradle/lib/gradle-bootstrap-5.6.jar +share/java/gradle/lib/gradle-build-cache-5.6.jar +share/java/gradle/lib/gradle-build-cache-packaging-5.6.jar +share/java/gradle/lib/gradle-build-option-5.6.jar +share/java/gradle/lib/gradle-cli-5.6.jar +share/java/gradle/lib/gradle-core-5.6.jar +share/java/gradle/lib/gradle-core-api-5.6.jar +share/java/gradle/lib/gradle-docs-5.6.jar +share/java/gradle/lib/gradle-execution-5.6.jar +share/java/gradle/lib/gradle-file-collections-5.6.jar +share/java/gradle/lib/gradle-files-5.6.jar +share/java/gradle/lib/gradle-hashing-5.6.jar +share/java/gradle/lib/gradle-installation-beacon-5.6.jar +share/java/gradle/lib/gradle-instant-execution-5.6.jar +share/java/gradle/lib/gradle-jvm-services-5.6.jar +share/java/gradle/lib/gradle-kotlin-dsl-5.6.jar +share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.6.jar +share/java/gradle/lib/gradle-launcher-5.6.jar +share/java/gradle/lib/gradle-logging-5.6.jar +share/java/gradle/lib/gradle-messaging-5.6.jar +share/java/gradle/lib/gradle-model-core-5.6.jar +share/java/gradle/lib/gradle-model-groovy-5.6.jar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/07/31 20:32:23 Modified files: security/burpsuite: Makefile distinfo Log message: Update to Burp Suite 2.1.02. http://releases.portswigger.net/2019/07/professional-community-edition-2102.html While here, update the PERMIT_* URLs to the latest URLs. ok rpointel@
UPDATE: security/burpsuite 2.1.02
This updates burpsuite to 2.1.02.
http://releases.portswigger.net/2019/07/professional-community-edition-2102.html
I've tested with both jdk 1.8 and 11.
While here I have also updated the PERMIT_* URLs to the latest URLs.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/burpsuite/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile19 Jul 2019 02:17:21 - 1.30
+++ Makefile28 Jul 2019 03:25:15 -
@@ -2,7 +2,7 @@
COMMENT = tool for testing security of web applications
-VERSION = 2.1.01
+VERSION = 2.1.02
DISTNAME = burpsuite_free_v${VERSION}
PKGNAME = burpsuite-${VERSION}
@@ -12,8 +12,8 @@ CATEGORIES = security
HOMEPAGE = https://portswigger.net/burp/
-PERMIT_PACKAGE = https://portswigger.net/burp/eula-free.html
-PERMIT_DISTFILES = https://portswigger.net/burp/eula-free.html
+PERMIT_PACKAGE = https://portswigger.net/burp/eula/community
+PERMIT_DISTFILES = https://portswigger.net/burp/eula/community
MASTER_SITES = https://portswigger.net/Burp/Releases/
Index: distinfo
===
RCS file: /cvs/ports/security/burpsuite/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo19 Jul 2019 02:17:21 - 1.24
+++ distinfo28 Jul 2019 02:53:56 -
@@ -1,2 +1,2 @@
-SHA256 (burpsuite_free_v2.1.01.jar) =
pC6iQApjkglzAbxdiGrB8XOiSpIcrWixXeyiWGLVZXs=
-SIZE (burpsuite_free_v2.1.01.jar) = 300627459
+SHA256 (burpsuite_free_v2.1.02.jar) =
6awlN3D+cWq+6M0ZhUlNBl4u/QDfC0Mxh6/BvsUIpDI=
+SIZE (burpsuite_free_v2.1.02.jar) = 301105466
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/07/24 20:18:25 Modified files: www/honk : Makefile distinfo www/honk/pkg : PLIST README Log message: Update to honk 0.7.4, from Horia Racoviceanu - add admin.txt - add memes directory - add emus directory - change user _honk home directory mode, no longer group writable - update README, add icon and favicon ok abieber@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/07/23 20:15:57 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_dynamic-preprocessors_appid_Makefile_in patch-src_preprocessors_Stream6_snort_stream_tcp_c Log message: Update to Snort 2.9.14. Also link libsf_appid_preproc.so against libc++abi so that luajit can access libunwind symbols, and regen patches and WANTLIB. tested by abieber@ ok abieber@, Markus Lude (maintainer)
Re: UPDATE: net/snort 2.9.14
On Mon, Jul 22, 2019 at 09:41:21PM -0600, Aaron Bieber wrote:
> Fixes it for me! Need to also regen WANTLIB, then OK abiener@
Great, thanks! Here is the updated diff with the regenerated WANTLIB.
Markus, is this ok with you too?
> > On Jul 22, 2019, at 9:13 PM, Lawrence Teo wrote:
> >
> > ???On Sun, Jul 21, 2019 at 11:38:06PM -0600, Aaron Bieber wrote:
> >>> On Fri, 19 Jul 2019 at 22:01:53 -0400, Lawrence Teo wrote:
> >>> This updates Snort to 2.9.14.
> >>>
> >>> https://blog.snort.org/2019/07/snort-29140-has-been-released.html
> >>>
> >>> ok?
> >>
> >> Builds and runs fine here! When I start it with "-d" I see:
> >>
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> >> '_Unwind_GetCFA'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> >> '_Unwind_DeleteException'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetGR'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetIP'
> >> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> >> '_Unwind_RaiseException'
> >>
> >> I think this might be a combo of the packages / snapshot I have. I will
> >> update
> >> and report back.
> >>
> >> If you aren't seeing the undefined symbols, OK abieber@
> >
> > Thanks for testing!
> >
> > It looks like those Unwind errors are due to libsf_appid_preproc.so
> > which links against luajit, which in turn needs access to libunwind
> > symbols.
> >
> > I found another port games/tome4 that had the same issue. In that port
> > the issue was resolved by linking against libc++abi (in
> > games/tome4/patches/lld-linking).
> >
> > Here's an updated diff that does the same thing for
> > libsf_appid_preproc.so. I made it link against libc++abi in
> > src/dynamic-preprocessors/appid/Makefile.in. I'm not certain that that
> > is the right place to fix it, but it does resolve those errors for me.
> >
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile12 Jul 2019 20:48:49 - 1.103
+++ Makefile23 Jul 2019 13:50:47 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.13
-RULESV = 29130
+DISTNAME = snort-2.9.14
+RULESV = 29140
SUBST_VARS = RULESV
CATEGORIES = net security
@@ -15,7 +15,8 @@ MAINTAINER = Markus Lude https://www.snort.org/downloads/snort/
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo2 Jun 2019 02:07:44 - 1.39
+++ distinfo19 Jul 2019 20:17:52 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.13.tar.gz) = MURzk9FShrhIgQ3XirLLOtIx/NHxZj+VlYdpDu6nVBM=
-SIZE (snort-2.9.13.tar.gz) = 6553425
+SHA256 (snort-2.9.14.tar.gz) = wDBtuc5k9FzHxkya/HCr6WidqoYAIDRew7oJmSi3Rks=
+SIZE (snort-2.9.14.tar.gz) = 6688482
Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_appid_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_dynamic-preprocessors_appid_Makefile_in
--- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 2 Jun 2019
02:07:44 - 1.2
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 23 Jul 2019
01:51:20 -
@@ -1,14 +1,19 @@
$OpenBSD: patch-src_dynamic-preprocessors_appid_Makefile_in,v 1.2 2019/06/02
02:07:44 lteo Exp $
+
+libsf_appid_preproc.so needs to link against libc++abi so that luajit can
access
+libunwind symbols.
Index: src/dynamic-preprocessors/appid/Makefile.in
--- src/dynamic-preprocessors/appid/Makefile.in.orig
+++ src/dynamic-preprocessors/appid/Makefile.in
-@@ -586,7 +586,7 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
+@@ -586,8 +586,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
$(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
-libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+-@SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
+libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
- @SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
++@SO_WITH_
Re: UPDATE: net/snort 2.9.14
On Sun, Jul 21, 2019 at 11:38:06PM -0600, Aaron Bieber wrote:
> On Fri, 19 Jul 2019 at 22:01:53 -0400, Lawrence Teo wrote:
> > This updates Snort to 2.9.14.
> >
> > https://blog.snort.org/2019/07/snort-29140-has-been-released.html
> >
> > ok?
>
> Builds and runs fine here! When I start it with "-d" I see:
>
> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_GetCFA'
> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> '_Unwind_DeleteException'
> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetGR'
> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetIP'
> snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol
> '_Unwind_RaiseException'
>
> I think this might be a combo of the packages / snapshot I have. I will update
> and report back.
>
> If you aren't seeing the undefined symbols, OK abieber@
Thanks for testing!
It looks like those Unwind errors are due to libsf_appid_preproc.so
which links against luajit, which in turn needs access to libunwind
symbols.
I found another port games/tome4 that had the same issue. In that port
the issue was resolved by linking against libc++abi (in
games/tome4/patches/lld-linking).
Here's an updated diff that does the same thing for
libsf_appid_preproc.so. I made it link against libc++abi in
src/dynamic-preprocessors/appid/Makefile.in. I'm not certain that that
is the right place to fix it, but it does resolve those errors for me.
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile12 Jul 2019 20:48:49 - 1.103
+++ Makefile19 Jul 2019 20:17:17 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.13
-RULESV = 29130
+DISTNAME = snort-2.9.14
+RULESV = 29140
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo2 Jun 2019 02:07:44 - 1.39
+++ distinfo19 Jul 2019 20:17:52 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.13.tar.gz) = MURzk9FShrhIgQ3XirLLOtIx/NHxZj+VlYdpDu6nVBM=
-SIZE (snort-2.9.13.tar.gz) = 6553425
+SHA256 (snort-2.9.14.tar.gz) = wDBtuc5k9FzHxkya/HCr6WidqoYAIDRew7oJmSi3Rks=
+SIZE (snort-2.9.14.tar.gz) = 6688482
Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_appid_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_dynamic-preprocessors_appid_Makefile_in
--- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 2 Jun 2019
02:07:44 - 1.2
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 23 Jul 2019
01:51:20 -
@@ -1,14 +1,19 @@
$OpenBSD: patch-src_dynamic-preprocessors_appid_Makefile_in,v 1.2 2019/06/02
02:07:44 lteo Exp $
+
+libsf_appid_preproc.so needs to link against libc++abi so that luajit can
access
+libunwind symbols.
Index: src/dynamic-preprocessors/appid/Makefile.in
--- src/dynamic-preprocessors/appid/Makefile.in.orig
+++ src/dynamic-preprocessors/appid/Makefile.in
-@@ -586,7 +586,7 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
+@@ -586,8 +586,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
$(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
-libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+-@SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
+libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
- @SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
++@SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS) -lc++abi
@SO_WITH_STATIC_LIB_TRUE@libsf_appid_preproc_la_LIBADD =
../libsf_dynamic_preproc.la ../libsf_dynamic_utils.la $(LUA_LIBS)
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_appid_preproc_la_SOURCES = \
+ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
Index: patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 2 Jun 2019
02:07:44 - 1.7
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: l...@cvs.openbsd.org2019/07/22 20:52:58
Modified files:
security/ghidra: Makefile
Log message:
Take maintainership; ok rpointel@
Add a comment that ST4-${ST4_VER}.jar is only needed during build for antlr;
it is not needed at runtime and therefore does not need to be packed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: l...@cvs.openbsd.org2019/07/22 20:09:20
Modified files:
security/ghidra: Makefile distinfo
security/ghidra/pkg: PLIST
Added files:
security/ghidra/files: repos.gradle
security/ghidra/patches: patch-GPL_CabExtract_build_gradle
patch-GPL_DemanglerGnu_Module_manifest
patch-GPL_DemanglerGnu_build_gradle
patch-GPL_nativeBuildProperties_gradle
patch-Ghidra_Features_Decompiler_build_gradle
patch-Ghidra_Features_Decompiler_src_decompile_cpp_Makefile
patch-Ghidra_Features_Decompiler_src_decompile_cpp_types_h
patch-Ghidra_Features_FunctionID_build_gradle
patch-Ghidra_Framework_Generic_src_main_java_ghidra_framework_Platform_java
patch-Ghidra_Framework_Help_src_main_java_help_GHelpBuilder_java
patch-Ghidra_Framework_SoftwareModeling_Module_manifest
patch-Ghidra_Framework_SoftwareModeling_build_gradle
patch-Ghidra_Framework_Utility_src_main_java_ghidra_framework_OperatingSystem_java
patch-Ghidra_RuntimeScripts_Linux_support_launch_sh
patch-build_gradle
patch-gradleScripts_distribution_gradle
patch-gradleScripts_ip_gradle
Removed files:
security/ghidra/patches: patch-support_launch_sh
Log message:
Build and pack native components so that Ghidra can decompile programs on
OpenBSD. This is based on a pull request from Jeremy O'Brien at
https://github.com/NationalSecurityAgency/ghidra/pull/490 and the Ghidra
build guide at
https://github.com/NationalSecurityAgency/ghidra/blob/master/DevGuide.md .
In addition, I have made these changes to make Ghidra work better as an OpenBSD
port:
1. I removed the explicit check for Gradle 5.0 because I was able to build
Ghidra with latest versions of Gradle. At the time of commit, our
java/gradle port is 5.5.1 which is the latest version of Gradle.
2. By default, the Ghidra build process tries to fetch dependent files on demand
while building. This will cause the build to fail if the port is built using
the _pbuild user. To fix this, I made the port fetch all the dependent .jar
files prior to building. I also used gradle's --offline flag which
explicitly tells gradle to "Execute the build without accessing network
resources".
3. To prevent the build process from touching $HOME, I made gradle use
${WRKDIR}/gradle as its home and also modified GHelpBuilder.java
(the program that builds help files during build) to log to ${WRKDIR}
instead of $HOME/.ghidra.
4. One of the Gradle scripts (ip.gradle) scans the Ghidra source tree so
I had to explicitly tell it to exclude *.orig and *.beforesubst.
help from bentley@ and Jeremy O'Brien
ok bentley@ rpointel@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/07/22 20:04:32 ports/security/ghidra/files Update of /cvs/ports/security/ghidra/files In directory cvs.openbsd.org:/tmp/cvs-serv45298/files Log Message: Directory /cvs/ports/security/ghidra/files added to the repository
UPDATE: net/snort 2.9.14
This updates Snort to 2.9.14. https://blog.snort.org/2019/07/snort-29140-has-been-released.html ok? Index: Makefile === RCS file: /cvs/ports/net/snort/Makefile,v retrieving revision 1.103 diff -u -p -r1.103 Makefile --- Makefile12 Jul 2019 20:48:49 - 1.103 +++ Makefile19 Jul 2019 20:17:17 - @@ -2,8 +2,8 @@ COMMENT = highly flexible sniffer/NIDS -DISTNAME = snort-2.9.13 -RULESV = 29130 +DISTNAME = snort-2.9.14 +RULESV = 29140 SUBST_VARS = RULESV CATEGORIES = net security Index: distinfo === RCS file: /cvs/ports/net/snort/distinfo,v retrieving revision 1.39 diff -u -p -r1.39 distinfo --- distinfo2 Jun 2019 02:07:44 - 1.39 +++ distinfo19 Jul 2019 20:17:52 - @@ -1,2 +1,2 @@ -SHA256 (snort-2.9.13.tar.gz) = MURzk9FShrhIgQ3XirLLOtIx/NHxZj+VlYdpDu6nVBM= -SIZE (snort-2.9.13.tar.gz) = 6553425 +SHA256 (snort-2.9.14.tar.gz) = wDBtuc5k9FzHxkya/HCr6WidqoYAIDRew7oJmSi3Rks= +SIZE (snort-2.9.14.tar.gz) = 6688482 Index: patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c === RCS file: /cvs/ports/net/snort/patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c,v retrieving revision 1.7 diff -u -p -r1.7 patch-src_preprocessors_Stream6_snort_stream_tcp_c --- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 2 Jun 2019 02:07:44 - 1.7 +++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 19 Jul 2019 20:18:18 - @@ -2,7 +2,7 @@ $OpenBSD: patch-src_preprocessors_Stream Index: src/preprocessors/Stream6/snort_stream_tcp.c --- src/preprocessors/Stream6/snort_stream_tcp.c.orig +++ src/preprocessors/Stream6/snort_stream_tcp.c -@@ -8562,7 +8562,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet +@@ -8575,7 +8575,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet char src_addr[17]; char dst_addr[17]; memset((char *)timestamp, 0, TIMEBUF_SIZE);
Re: CVS: cvs.openbsd.org: ports
On Thu, Jul 18, 2019 at 08:17:21PM -0600, Lawrence Teo wrote: > CVSROOT: /cvs > Module name: ports > Changes by: l...@cvs.openbsd.org2019/07/18 20:17:21 > > Modified files: > security/burpsuite: Makefile distinfo > > Log message: > Update to Burp Suite 2.1.01. > > http://releases.portswigger.net/2019/06/professional-community-edition-21.html > http://releases.portswigger.net/2019/07/professional-community-edition-2101.html > > Change MODJAVA_VER to 1.8+ since this new version works fine with both jdk 1.8 > and 11. > > Also fix a long line to make portcheck(1) happy; from abieber@, thanks! > > ok abieber@ also ok rpointel@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/07/18 20:22:31 Modified files: java/gradle: Makefile distinfo java/gradle/pkg: PLIST Log message: Update to Gradle 5.5.1 https://docs.gradle.org/5.5.1/release-notes.html ok abieber@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/07/18 20:17:21 Modified files: security/burpsuite: Makefile distinfo Log message: Update to Burp Suite 2.1.01. http://releases.portswigger.net/2019/06/professional-community-edition-21.html http://releases.portswigger.net/2019/07/professional-community-edition-2101.html Change MODJAVA_VER to 1.8+ since this new version works fine with both jdk 1.8 and 11. Also fix a long line to make portcheck(1) happy; from abieber@, thanks! ok abieber@
UPDATE: security/burpsuite 2.1.01
This updates burpsuite to 2.1.01.
http://releases.portswigger.net/2019/06/professional-community-edition-21.html
http://releases.portswigger.net/2019/07/professional-community-edition-2101.html
I've tested with both jdk 1.8 and 11.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/burpsuite/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile26 Jun 2019 09:48:45 - 1.29
+++ Makefile17 Jul 2019 23:50:23 -
@@ -2,10 +2,9 @@
COMMENT = tool for testing security of web applications
-VERSION = 1.7.36
+VERSION = 2.1.01
DISTNAME = burpsuite_free_v${VERSION}
PKGNAME = burpsuite-${VERSION}
-REVISION = 1
DISTFILES=${DISTNAME}${EXTRACT_SUFX}{Download?productId=100\=${VERSION}\=Jar}
@@ -22,8 +21,7 @@ EXTRACT_ONLY =
EXTRACT_SUFX = .jar
MODULES = java
-# XXX if updating, please check if it works with jdk 11 and switch to "1.8+"
if ok
-MODJAVA_VER = 1.8
+MODJAVA_VER = 1.8+
RUN_DEPENDS = java/javaPathHelper
Index: distinfo
===
RCS file: /cvs/ports/security/burpsuite/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo30 Jul 2018 14:07:30 - 1.23
+++ distinfo17 Jul 2019 23:51:27 -
@@ -1,2 +1,2 @@
-SHA256 (burpsuite_free_v1.7.36.jar) =
KpQ3op8+BClXGuIaGFbSC+xykTHNk0q6yQk1T4B1pIo=
-SIZE (burpsuite_free_v1.7.36.jar) = 26466374
+SHA256 (burpsuite_free_v2.1.01.jar) =
pC6iQApjkglzAbxdiGrB8XOiSpIcrWixXeyiWGLVZXs=
+SIZE (burpsuite_free_v2.1.01.jar) = 300627459
Re: Lynis-2.7.5
On Mon, Jul 15, 2019 at 11:42:37AM +0200, Gonzalo L. Rodriguez wrote: > Hello, > > Update for Lynis to 2.7.5: > > https://cisofy.com/changelog/lynis/#275 > > OK? Comments? Tested and works fine. ok lteo@ > Cheers.- > > -- > > - gonzalo > Index: Makefile > === > RCS file: /cvs/ports/security/lynis/Makefile,v > retrieving revision 1.35 > diff -u -p -r1.35 Makefile > --- Makefile 12 Jul 2019 20:49:05 - 1.35 > +++ Makefile 15 Jul 2019 09:41:25 - > @@ -2,7 +2,7 @@ > > COMMENT= security auditing tool > > -DISTNAME = lynis-2.7.4 > +DISTNAME = lynis-2.7.5 > > CATEGORIES= security > > Index: distinfo > === > RCS file: /cvs/ports/security/lynis/distinfo,v > retrieving revision 1.31 > diff -u -p -r1.31 distinfo > --- distinfo 2 May 2019 09:27:09 - 1.31 > +++ distinfo 15 Jul 2019 09:41:25 - > @@ -1,2 +1,2 @@ > -SHA256 (lynis-2.7.4.tar.gz) = o/YVeT/4BzO64VWEiTpAhhAdiRxhw6UtKA37ZYy5j70= > -SIZE (lynis-2.7.4.tar.gz) = 287563 > +SHA256 (lynis-2.7.5.tar.gz) = PSet5zpcEkiSWtnAYAJJQM5dICn0CqqQH0MxSIj+Mk0= > +SIZE (lynis-2.7.5.tar.gz) = 288688 > Index: pkg/PLIST > === > RCS file: /cvs/ports/security/lynis/pkg/PLIST,v > retrieving revision 1.19 > diff -u -p -r1.19 PLIST > --- pkg/PLIST 2 May 2019 09:27:09 - 1.19 > +++ pkg/PLIST 15 Jul 2019 09:41:25 - > @@ -22,6 +22,7 @@ share/lynis/db/languages/ > share/lynis/db/languages/az > share/lynis/db/languages/br > share/lynis/db/languages/cn > +share/lynis/db/languages/da > share/lynis/db/languages/de > share/lynis/db/languages/en > share/lynis/db/languages/en-GB
UPDATE: java/gradle 5.5.1
This updates Gradle to 5.5.1. https://docs.gradle.org/5.5.1/release-notes.html I have confirmed that my WIP ghidra diff at https://marc.info/?l=openbsd-ports=156323935501672=2 builds successfully with this Gradle update. ok? Index: Makefile === RCS file: /cvs/ports/java/gradle/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile17 Jun 2019 02:03:44 - 1.1.1.1 +++ Makefile14 Jul 2019 02:41:55 - @@ -2,7 +2,7 @@ COMMENT = build automation tool -DISTNAME = gradle-5.4.1 +DISTNAME = gradle-5.5.1 EXTRACT_SUFX = -bin.zip CATEGORIES = java Index: distinfo === RCS file: /cvs/ports/java/gradle/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo17 Jun 2019 02:03:44 - 1.1.1.1 +++ distinfo14 Jul 2019 02:45:00 - @@ -1,2 +1,2 @@ -SHA256 (gradle-5.4.1-bin.zip) = e9utHk9U8TyKeKvADCbUTdhwnUrttwTZE/sbt4rAJdw= -SIZE (gradle-5.4.1-bin.zip) = 87107055 +SHA256 (gradle-5.5.1-bin.zip) = IioD/PL8rzaRdnzpVJ9469SnfnP54jo5aJn7cLQgzQA= +SIZE (gradle-5.5.1-bin.zip) = 89152247 Index: pkg/PLIST === RCS file: /cvs/ports/java/gradle/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 17 Jun 2019 02:03:44 - 1.1.1.1 +++ pkg/PLIST 14 Jul 2019 02:46:51 - @@ -12,8 +12,8 @@ share/java/gradle/init.d/ share/java/gradle/init.d/readme.txt share/java/gradle/lib/ share/java/gradle/lib/annotations-13.0.jar -share/java/gradle/lib/ant-1.9.13.jar -share/java/gradle/lib/ant-launcher-1.9.13.jar +share/java/gradle/lib/ant-1.9.14.jar +share/java/gradle/lib/ant-launcher-1.9.14.jar share/java/gradle/lib/asm-7.0.jar share/java/gradle/lib/asm-analysis-7.0.jar share/java/gradle/lib/asm-commons-7.0.jar @@ -21,51 +21,54 @@ share/java/gradle/lib/asm-tree-7.0.jar share/java/gradle/lib/commons-compress-1.18.jar share/java/gradle/lib/commons-io-2.6.jar share/java/gradle/lib/commons-lang-2.6.jar +share/java/gradle/lib/failureaccess-1.0.1.jar share/java/gradle/lib/fastutil-8.2.1-min.jar -share/java/gradle/lib/gradle-api-metadata-5.4.1.jar -share/java/gradle/lib/gradle-base-services-5.4.1.jar -share/java/gradle/lib/gradle-base-services-groovy-5.4.1.jar -share/java/gradle/lib/gradle-build-cache-5.4.1.jar -share/java/gradle/lib/gradle-build-cache-packaging-5.4.1.jar -share/java/gradle/lib/gradle-build-option-5.4.1.jar -share/java/gradle/lib/gradle-cli-5.4.1.jar -share/java/gradle/lib/gradle-core-5.4.1.jar -share/java/gradle/lib/gradle-core-api-5.4.1.jar -share/java/gradle/lib/gradle-docs-5.4.1.jar -share/java/gradle/lib/gradle-execution-5.4.1.jar -share/java/gradle/lib/gradle-files-5.4.1.jar -share/java/gradle/lib/gradle-installation-beacon-5.4.1.jar -share/java/gradle/lib/gradle-jvm-services-5.4.1.jar -share/java/gradle/lib/gradle-kotlin-dsl-5.4.1.jar -share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.4.1.jar -share/java/gradle/lib/gradle-launcher-5.4.1.jar -share/java/gradle/lib/gradle-logging-5.4.1.jar -share/java/gradle/lib/gradle-messaging-5.4.1.jar -share/java/gradle/lib/gradle-model-core-5.4.1.jar -share/java/gradle/lib/gradle-model-groovy-5.4.1.jar -share/java/gradle/lib/gradle-native-5.4.1.jar -share/java/gradle/lib/gradle-persistent-cache-5.4.1.jar -share/java/gradle/lib/gradle-process-services-5.4.1.jar -share/java/gradle/lib/gradle-resources-5.4.1.jar -share/java/gradle/lib/gradle-runtime-api-info-5.4.1.jar -share/java/gradle/lib/gradle-snapshots-5.4.1.jar -share/java/gradle/lib/gradle-tooling-api-5.4.1.jar -share/java/gradle/lib/gradle-wrapper-5.4.1.jar +share/java/gradle/lib/gradle-api-metadata-5.5.1.jar +share/java/gradle/lib/gradle-base-services-5.5.1.jar +share/java/gradle/lib/gradle-base-services-groovy-5.5.1.jar +share/java/gradle/lib/gradle-build-cache-5.5.1.jar +share/java/gradle/lib/gradle-build-cache-packaging-5.5.1.jar +share/java/gradle/lib/gradle-build-option-5.5.1.jar +share/java/gradle/lib/gradle-cli-5.5.1.jar +share/java/gradle/lib/gradle-core-5.5.1.jar +share/java/gradle/lib/gradle-core-api-5.5.1.jar +share/java/gradle/lib/gradle-docs-5.5.1.jar +share/java/gradle/lib/gradle-execution-5.5.1.jar +share/java/gradle/lib/gradle-files-5.5.1.jar +share/java/gradle/lib/gradle-installation-beacon-5.5.1.jar +share/java/gradle/lib/gradle-instant-execution-5.5.1.jar +share/java/gradle/lib/gradle-jvm-services-5.5.1.jar +share/java/gradle/lib/gradle-kotlin-dsl-5.5.1.jar +share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.5.1.jar +share/java/gradle/lib/gradle-launcher-5.5.1.jar +share/java/gradle/lib/gradle-logging-5.5.1.jar +share/java/gradle/lib/gradle-messaging-5.5.1.jar +share/java/gradle/lib/gradle-model-core-5.5.1.jar +share/java/gradle/lib/gradle-model-groovy-5.5.1.jar +share/java/gradle/lib/gradle-native-5.5.1.jar +share/java/gradle/lib/gradle-persistent-cache-5.5.1.jar
Re: [NEW] security/ghidra
On Sat, Jun 22, 2019 at 10:26:11PM -0400, Lawrence Teo wrote:
> On Fri, Jun 21, 2019 at 01:48:59AM -0600, Anthony J. Bentley wrote:
> > Lawrence Teo writes:
> > > I used SUBST_CMD to substitute WRKDIR in GHelpBuilder.java, and
> > > accidentally included the substituted value in my diff when I
> > > regenerated patches.
> > >
> > > I have fixed it in this latest diff. Could you please test if it works
> > > for you?
> >
> > Thanks, ghidra and the decompiler work fine now.
>
> Great to hear that it works!
>
> > If any patches are pulled from GitHub, please add a comment with the
> > commit or a link to the pull request.
> >
> > ok bentley@
>
> Thanks for the ok and feedback. I have created a new diff where I have
> added the link to the GitHub pull request as a comment to all the patch
> files that were created/adapted from that pull request. There are no
> changes apart from adding those comments.
>
> Remi, are you ok with this going in?
Here's an updated diff so that it will apply after sthen@'s
PERMIT_PACKAGE_CDROM -> PERMIT_PACKAGE sweep. There are no other
changes.
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile12 Jul 2019 20:49:02 - 1.4
+++ Makefile14 Jul 2019 03:04:19 -
@@ -6,9 +6,13 @@ ONLY_FOR_ARCHS = amd64
COMMENT = software reverse engineering (SRE) framework
VERSION = 9.0.4
-REVISION = 0
-DISTNAME = ghidra_9.0.4_PUBLIC_20190516
-PKGNAME = ghidra-${VERSION}
+GHIDRA_DATE = 20190516
+REVISION = 1
+
+GH_ACCOUNT = NationalSecurityAgency
+GH_PROJECT = ghidra
+GH_TAGNAME = Ghidra_${VERSION}_build
+DISTNAME = ghidra-${VERSION}
CATEGORIES = security
@@ -19,30 +23,113 @@ MAINTAINER = Remi Pointel https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
+MASTER_SITES2 =https://repo.maven.apache.org/maven2/
EXTRACT_SUFX = .zip
+ST4_VER = 4.1
+HAMCREST_VER = 1.3
+JAVACC_VER = 5.0
+JMOCKIT_VER = 1.44
+JSON_SIMPLE_VER = 1.1.1
+JUNIT_VER =4.12
+YAJSW_VER =12.12
+
+JAR_DISTFILES += ST4{org/antlr/ST4/${ST4_VER}/ST4}-${ST4_VER}.jar
+JAR_DISTFILES +=
hamcrest{org/hamcrest/hamcrest-all/${HAMCREST_VER}/hamcrest}-all-${HAMCREST_VER}.jar
+JAR_DISTFILES +=
javacc{net/java/dev/javacc/javacc/${JAVACC_VER}/javacc}-${JAVACC_VER}.jar
+JAR_DISTFILES +=
jmockit{org/jmockit/jmockit/${JMOCKIT_VER}/jmockit}-${JMOCKIT_VER}.jar
+JAR_DISTFILES +=
json-simple{com/googlecode/json-simple/json-simple/${JSON_SIMPLE_VER}/json-simple}-${JSON_SIMPLE_VER}.jar
+JAR_DISTFILES += junit{junit/junit/${JUNIT_VER}/junit}-${JUNIT_VER}.jar
+
+DISTFILES =${DISTNAME}.tar.gz
+DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
+DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
+DISTFILES += ${JAR_DISTFILES:C/$/:2/}
+
+EXTRACT_ONLY = ${DISTNAME}.tar.gz
+
MODULES = java
MODJAVA_VER = 11+
+BUILD_DEPENDS =archivers/unzip \
+ devel/bison \
+ java/gradle \
+ shells/bash
+
RUN_DEPENDS = shells/bash \
java/javaPathHelper
-NO_BUILD = Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/${PKGNAME:S/-/_/}
+SUBST_VARS += GHIDRA_DATE VERSION WRKDIR
+
+JAR_DIRS +=Features-FileFormats
+JAR_DIRS +=Features-Python
+JAR_DIRS +=Framework-Docking
+JAR_DIRS +=Framework-FileSystem
+JAR_DIRS +=Framework-Generic
+JAR_DIRS +=Framework-Graph
+JAR_DIRS +=Framework-Project
+JAR_DIRS +=Framework-SoftwareModeling
post-extract:
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/ghidraRun
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/ghidraRun
+ @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/support/launch.sh
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
+ @perl -pi -e 's,(application.version)=.*,\1=${VERSION},' \
+ ${WRKSRC}/Ghidra/application.properties
+
+# Steps derived from:
+# https://github.com/NationalSecurityAgency/ghidra/blob/master/DevGuide.md
+pre-build:
+ cp ${FILESDIR}/repos.gradle ${WRKDIR}
+ ${SUBST_CMD} ${WRKDIR}/repos.gradle \
+
${WRKSRC}/Ghidra/Framework/Help/src/main/java/help/GHelpBuilder.java
+ mkd
Re: UPDATE: SQLMap 1.3.7
On Fri, Jul 12, 2019 at 03:18:41PM +0200, Gonzalo L. Rodriguez wrote:
> Hello,
>
> Update for SQLMap 1.3.7:
>
> https://github.com/sqlmapproject/sqlmap
>
> OK? Comments?
I've tested your update and it works fine for me. ok lteo@
> Cheers.-
>
> --
>
> - gonzalo
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/sqlmap/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 6 Jun 2019 07:02:20 - 1.20
> +++ Makefile 11 Jul 2019 21:36:04 -
> @@ -4,7 +4,7 @@ COMMENT = penetration testing tool to d
>
> GH_ACCOUNT = sqlmapproject
> GH_PROJECT = sqlmap
> -GH_TAGNAME = 1.3.6
> +GH_TAGNAME = 1.3.7
>
> CATEGORIES = security
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/sqlmap/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- distinfo 6 Jun 2019 07:02:20 - 1.16
> +++ distinfo 11 Jul 2019 21:36:04 -
> @@ -1,2 +1,2 @@
> -SHA256 (sqlmap-1.3.6.tar.gz) = JlN42T1POgJevf1eUCpntMA9FNZjgWFcT08S5jZwvdQ=
> -SIZE (sqlmap-1.3.6.tar.gz) = 7452711
> +SHA256 (sqlmap-1.3.7.tar.gz) = +f3Rxb4bn0yUXAGspumGCI6NfnNJATGYqflXckx5lcA=
> +SIZE (sqlmap-1.3.7.tar.gz) = 7482163
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/sqlmap/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST 6 Jun 2019 07:02:20 - 1.16
> +++ pkg/PLIST 11 Jul 2019 21:36:05 -
> @@ -31,6 +31,7 @@ share/sqlmap/data/procs/mysql/dns_reques
> share/sqlmap/data/procs/mysql/write_file_limit.sql
> share/sqlmap/data/procs/oracle/
> share/sqlmap/data/procs/oracle/dns_request.sql
> +share/sqlmap/data/procs/oracle/read_file_export_extension.sql
> share/sqlmap/data/procs/postgresql/
> share/sqlmap/data/procs/postgresql/dns_request.sql
> share/sqlmap/data/shell/
> @@ -47,6 +48,7 @@ share/sqlmap/data/shell/stagers/stager.j
> share/sqlmap/data/shell/stagers/stager.php_
> share/sqlmap/data/txt/
> share/sqlmap/data/txt/common-columns.txt
> +share/sqlmap/data/txt/common-files.txt
> share/sqlmap/data/txt/common-outputs.txt
> share/sqlmap/data/txt/common-tables.txt
> share/sqlmap/data/txt/keywords.txt
> @@ -69,6 +71,10 @@ share/sqlmap/data/udf/mysql/windows/64/l
> share/sqlmap/data/udf/postgresql/
> share/sqlmap/data/udf/postgresql/linux/
> share/sqlmap/data/udf/postgresql/linux/32/
> +share/sqlmap/data/udf/postgresql/linux/32/10/
> +share/sqlmap/data/udf/postgresql/linux/32/10/lib_postgresqludf_sys.so_
> +share/sqlmap/data/udf/postgresql/linux/32/11/
> +share/sqlmap/data/udf/postgresql/linux/32/11/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/linux/32/8.2/
> share/sqlmap/data/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/linux/32/8.3/
> @@ -85,7 +91,15 @@ share/sqlmap/data/udf/postgresql/linux/3
> share/sqlmap/data/udf/postgresql/linux/32/9.3/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/linux/32/9.4/
> share/sqlmap/data/udf/postgresql/linux/32/9.4/lib_postgresqludf_sys.so_
> +share/sqlmap/data/udf/postgresql/linux/32/9.5/
> +share/sqlmap/data/udf/postgresql/linux/32/9.5/lib_postgresqludf_sys.so_
> +share/sqlmap/data/udf/postgresql/linux/32/9.6/
> +share/sqlmap/data/udf/postgresql/linux/32/9.6/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/linux/64/
> +share/sqlmap/data/udf/postgresql/linux/64/10/
> +share/sqlmap/data/udf/postgresql/linux/64/10/lib_postgresqludf_sys.so_
> +share/sqlmap/data/udf/postgresql/linux/64/11/
> +share/sqlmap/data/udf/postgresql/linux/64/11/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/linux/64/8.2/
> share/sqlmap/data/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/linux/64/8.3/
> @@ -102,6 +116,10 @@ share/sqlmap/data/udf/postgresql/linux/6
> share/sqlmap/data/udf/postgresql/linux/64/9.3/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/linux/64/9.4/
> share/sqlmap/data/udf/postgresql/linux/64/9.4/lib_postgresqludf_sys.so_
> +share/sqlmap/data/udf/postgresql/linux/64/9.5/
> +share/sqlmap/data/udf/postgresql/linux/64/9.5/lib_postgresqludf_sys.so_
> +share/sqlmap/data/udf/postgresql/linux/64/9.6/
> +share/sqlmap/data/udf/postgresql/linux/64/9.6/lib_postgresqludf_sys.so_
> share/sqlmap/data/udf/postgresql/windows/
> share/sqlmap/data/udf/postgresql/windows/32/
> share/sqlmap/data/udf/postgresql/windows/32/8.2/
> @@ -201,7 +219,6 @@ share/sqlmap/extra/shutils/
> ${MODPY_COMMENT}share/sqlmap/extra/shutils/${MODPY_PYCACHE}/
>
> share/sqlmap/extra/shutils/${MODPY_PYCACHE}duplicates.${MODPY_PYC_MAGIC_TAG}pyc
> share/sqlmap/extra/shutils/${MODPY_PYCACHE}newlines.${MODPY_PYC_MAGIC_TAG}pyc
> -share/sqlmap/extra/shutils/${MODPY_PYCACHE}pylint.${MODPY_PYC_MAGIC_TAG}pyc
>
UPDATE: security/burpsuite 2.1
This updates Burp Suite Community Edition to 2.1.
http://releases.portswigger.net/2019/06/professional-community-edition-21.html
I tested it with jdk 1.8 and 11 and it works fine with both.
The previous burpsuite version could only use jdk 1.8 due to an issue
with HTTPS interception [1] but that has been resolved with this new
version, so I have changed MODJAVA_VER to 1.8+.
Comments? ok?
1. https://marc.info/?l=openbsd-ports=155944649912673=2
Index: Makefile
===
RCS file: /cvs/ports/security/burpsuite/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile26 Jun 2019 09:48:45 - 1.29
+++ Makefile13 Jul 2019 02:55:50 -
@@ -2,10 +2,9 @@
COMMENT = tool for testing security of web applications
-VERSION = 1.7.36
+VERSION = 2.1
DISTNAME = burpsuite_free_v${VERSION}
PKGNAME = burpsuite-${VERSION}
-REVISION = 1
DISTFILES=${DISTNAME}${EXTRACT_SUFX}{Download?productId=100\=${VERSION}\=Jar}
@@ -22,8 +21,7 @@ EXTRACT_ONLY =
EXTRACT_SUFX = .jar
MODULES = java
-# XXX if updating, please check if it works with jdk 11 and switch to "1.8+"
if ok
-MODJAVA_VER = 1.8
+MODJAVA_VER = 1.8+
RUN_DEPENDS = java/javaPathHelper
Index: distinfo
===
RCS file: /cvs/ports/security/burpsuite/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo30 Jul 2018 14:07:30 - 1.23
+++ distinfo13 Jul 2019 02:56:55 -
@@ -1,2 +1,2 @@
-SHA256 (burpsuite_free_v1.7.36.jar) =
KpQ3op8+BClXGuIaGFbSC+xykTHNk0q6yQk1T4B1pIo=
-SIZE (burpsuite_free_v1.7.36.jar) = 26466374
+SHA256 (burpsuite_free_v2.1.jar) = 1ScVdtE8pVQhnDQZhAx9Rpbyr/N0mDJ6CxvKYcE0lrg=
+SIZE (burpsuite_free_v2.1.jar) = 293049106
Re: iperf3 update
On Wed, Jun 26, 2019 at 11:15:34PM +0100, Stuart Henderson wrote:
> - update to 3.7
>
> - switch from git auto tarball to a proper one
>
> - turn off the openssl/auth code. there are some minor 64-bit
> time_t issues in iperf_auth.c, easy enough to fix those but one of
> these is on a sscanf line that doesn't exactly inspire confidence,
> that could be revisited if anyone actually misses this feature
>
> comments/ok?
Hi Stuart,
Thanks for working on this! Builds and tests fine, ok lteo@
Lawrence
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/iperf3/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 11 Jul 2018 15:36:55 - 1.3
> +++ Makefile 26 Jun 2019 22:15:13 -
> @@ -2,28 +2,26 @@
>
> COMMENT= tool to measure maximum achievable bandwidth on IP networks
>
> -V= 3.6
> +V= 3.7
> PKGNAME= iperf3-${V}
> +DISTNAME=iperf-${V}
>
> -GH_ACCOUNT= esnet
> -GH_PROJECT= iperf
> -GH_TAGNAME= ${V}
> -
> -SHARED_LIBS += iperf0.0 # 0.0
> +SHARED_LIBS += iperf1.0 # 0.0
>
> CATEGORIES= net
>
> -HOMEPAGE= http://software.es.net/iperf/
> +HOMEPAGE=https://software.es.net/iperf/
>
> MAINTAINER= Lawrence Teo
>
> # BSD 3-clause
> -PERMIT_PACKAGE_CDROM=Yes
> +PERMIT_PACKAGE= Yes
>
> -WANTLIB += c crypto m ssl
> +WANTLIB += c m
>
> -MASTER_SITES=${MASTER_SITES_GITHUB}
> +MASTER_SITES=https://downloads.es.net/pub/iperf/
>
> CONFIGURE_STYLE= gnu
> +CONFIGURE_ARGS= --with-openssl=no
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/iperf3/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 11 Jul 2018 15:36:55 - 1.2
> +++ distinfo 26 Jun 2019 22:15:13 -
> @@ -1,2 +1,2 @@
> -SHA256 (iperf-3.6.tar.gz) = GtI/cKjrS4kqPLskfK+pVuD1x9i4YBsdnIAxwqgG8j8=
> -SIZE (iperf-3.6.tar.gz) = 602406
> +SHA256 (iperf-3.7.tar.gz) = 2EYEAiQxfK8vdchD0wmpUKfbI/m0S5RojMvlV9bRcQw=
> +SIZE (iperf-3.7.tar.gz) = 605708
> Index: patches/patch-src_Makefile_in
> ===
> RCS file: patches/patch-src_Makefile_in
> diff -N patches/patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 25 May 2017 12:56:35 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-src_Makefile_in,v 1.1 2017/05/25 12:56:35 sthen Exp $
> -
> -disable building the profiled binary, it wasn't installed anyway, and fails
> with clang
> -
> -Index: src/Makefile.in
> src/Makefile.in.orig
> -+++ src/Makefile.in
> -@@ -91,8 +91,7 @@ POST_UNINSTALL = :
> - build_triplet = @build@
> - host_triplet = @host@
> - bin_PROGRAMS = iperf3$(EXEEXT)
> --noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) \
> --iperf3_profile$(EXEEXT)
> -+noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT)
> - TESTS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT)
> - subdir = src
> - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> Index: patches/patch-src_iperf_api_c
> ===
> RCS file: /cvs/ports/net/iperf3/patches/patch-src_iperf_api_c,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-src_iperf_api_c
> --- patches/patch-src_iperf_api_c 11 Jul 2018 15:36:55 - 1.3
> +++ patches/patch-src_iperf_api_c 26 Jun 2019 22:15:13 -
> @@ -1,9 +1,11 @@
> $OpenBSD: patch-src_iperf_api_c,v 1.3 2018/07/11 15:36:55 gonzalo Exp $
>
> +Default to IPv4.
> +
> Index: src/iperf_api.c
> --- src/iperf_api.c.orig
> +++ src/iperf_api.c
> -@@ -2145,7 +2145,7 @@ iperf_defaults(struct iperf_test *testp)
> +@@ -2314,7 +2314,7 @@ iperf_defaults(struct iperf_test *testp)
> testp->stats_interval = testp->reporter_interval = 1;
> testp->num_streams = 1;
>
> Index: patches/patch-src_iperf_udp_c
> ===
> RCS file: patches/patch-src_iperf_udp_c
> diff -N patches/patch-src_iperf_udp_c
> --- patches/patch-src_iperf_udp_c 11 Jul 2018 15:36:55 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-src_iperf_udp_c,v 1.2 2018/07/11 15:36:55 gonzalo Exp $
> -
> -Print uint64_t using %llu, size_t is 32 bits on LP32 archs.
> -
> -Index: src/iperf_udp.c
> src/iperf_udp.c.orig
> -+++ src/iperf_udp.c
> -@@ -149,7 +149,7 @@ iperf_udp_recv(
Re: [NEW] security/ghidra
On Fri, Jun 21, 2019 at 01:48:59AM -0600, Anthony J. Bentley wrote:
> Lawrence Teo writes:
> > I used SUBST_CMD to substitute WRKDIR in GHelpBuilder.java, and
> > accidentally included the substituted value in my diff when I
> > regenerated patches.
> >
> > I have fixed it in this latest diff. Could you please test if it works
> > for you?
>
> Thanks, ghidra and the decompiler work fine now.
Great to hear that it works!
> If any patches are pulled from GitHub, please add a comment with the
> commit or a link to the pull request.
>
> ok bentley@
Thanks for the ok and feedback. I have created a new diff where I have
added the link to the GitHub pull request as a comment to all the patch
files that were created/adapted from that pull request. There are no
changes apart from adding those comments.
Remi, are you ok with this going in?
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Jun 2019 00:38:36 - 1.3
+++ Makefile23 Jun 2019 01:08:36 -
@@ -6,9 +6,13 @@ ONLY_FOR_ARCHS = amd64
COMMENT = software reverse engineering (SRE) framework
VERSION = 9.0.4
-REVISION = 0
-DISTNAME = ghidra_9.0.4_PUBLIC_20190516
-PKGNAME = ghidra-${VERSION}
+GHIDRA_DATE = 20190516
+REVISION = 1
+
+GH_ACCOUNT = NationalSecurityAgency
+GH_PROJECT = ghidra
+GH_TAGNAME = Ghidra_${VERSION}_build
+DISTNAME = ghidra-${VERSION}
CATEGORIES = security
@@ -17,32 +21,115 @@ HOMEPAGE = https://www.ghidra-sre.org/
MAINTAINER = Remi Pointel
# Apache v2
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
+
+WANTLIB += c m stdc++
-MASTER_SITES = ${HOMEPAGE}
+MASTER_SITES0 =${HOMEPAGE}
+MASTER_SITES1 =
https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
+MASTER_SITES2 =https://repo.maven.apache.org/maven2/
EXTRACT_SUFX = .zip
+ST4_VER = 4.1
+HAMCREST_VER = 1.3
+JAVACC_VER = 5.0
+JMOCKIT_VER = 1.44
+JSON_SIMPLE_VER = 1.1.1
+JUNIT_VER =4.12
+YAJSW_VER =12.12
+
+JAR_DISTFILES += ST4{org/antlr/ST4/${ST4_VER}/ST4}-${ST4_VER}.jar
+JAR_DISTFILES +=
hamcrest{org/hamcrest/hamcrest-all/${HAMCREST_VER}/hamcrest}-all-${HAMCREST_VER}.jar
+JAR_DISTFILES +=
javacc{net/java/dev/javacc/javacc/${JAVACC_VER}/javacc}-${JAVACC_VER}.jar
+JAR_DISTFILES +=
jmockit{org/jmockit/jmockit/${JMOCKIT_VER}/jmockit}-${JMOCKIT_VER}.jar
+JAR_DISTFILES +=
json-simple{com/googlecode/json-simple/json-simple/${JSON_SIMPLE_VER}/json-simple}-${JSON_SIMPLE_VER}.jar
+JAR_DISTFILES += junit{junit/junit/${JUNIT_VER}/junit}-${JUNIT_VER}.jar
+
+DISTFILES =${DISTNAME}.tar.gz
+DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
+DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
+DISTFILES += ${JAR_DISTFILES:C/$/:2/}
+
+EXTRACT_ONLY = ${DISTNAME}.tar.gz
+
MODULES = java
MODJAVA_VER = 11+
+BUILD_DEPENDS =archivers/unzip \
+ devel/bison \
+ java/gradle \
+ shells/bash
+
RUN_DEPENDS = shells/bash \
java/javaPathHelper
-NO_BUILD = Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/${PKGNAME:S/-/_/}
+SUBST_VARS += GHIDRA_DATE VERSION WRKDIR
+
+JAR_DIRS +=Features-FileFormats
+JAR_DIRS +=Features-Python
+JAR_DIRS +=Framework-Docking
+JAR_DIRS +=Framework-FileSystem
+JAR_DIRS +=Framework-Generic
+JAR_DIRS +=Framework-Graph
+JAR_DIRS +=Framework-Project
+JAR_DIRS +=Framework-SoftwareModeling
post-extract:
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/ghidraRun
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/ghidraRun
+ @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/support/launch.sh
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
+ @perl -pi -e 's,(application.version)=.*,\1=${VERSION},' \
+ ${WRKSRC}/Ghidra/application.properties
+
+# Steps derived from:
+# https://github.com/NationalSecurityAgency/ghidra/blob/master/DevGuide.md
+pre-build:
+ cp ${FILESDIR}/repos.gradle ${WRKDIR}
+ ${SUBST_CMD} ${WRKDIR}/repos.gradle \
+
${WRKSRC}/Ghidra/Framework/Help/src/main/java/help/GHelpBuilder.java
+ mkdir ${WRKDIR}/{flatRepo,gradle,home}
+.for dir in ${JAR_DI
Re: [NEW] security/ghidra
On Thu, Jun 20, 2019 at 04:22:28AM -0600, Anthony J. Bentley wrote:
> Lawrence Teo writes:
> > Here's an updated diff that makes the port fetch all the dependent
> > .jar files prior to building.
> >
> > I also used gradle's --offline flag which explicitly tells gradle to
> > "Execute the build without accessing network resources".
> >
> > Could you please try this diff to see if it resolves your issue?
>
> Thanks. That issue seems to be resolved, but I'm seeing another build
> failure:
>
> > Task :Base:buildHelp FAILED
> Exception in thread "main" ghidra.util.exception.AssertException: Failed to
> create user settings directory:
> /usr/ports/pobj/ghidra-9.0.4/home/.ghidra/.ghidra-9.0.4
> at ghidra.framework.Application.initialize(Application.java:78)
> at
> ghidra.framework.Application.initializeApplication(Application.java:114)
> at help.GHelpBuilder.main(GHelpBuilder.java:73)
>
> FAILURE: Build failed with an exception.
Oops! Sorry, that was a mistake on my part.
I used SUBST_CMD to substitute WRKDIR in GHelpBuilder.java, and
accidentally included the substituted value in my diff when I
regenerated patches.
I have fixed it in this latest diff. Could you please test if it works
for you?
Thanks,
Lawrence
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Jun 2019 00:38:36 - 1.3
+++ Makefile20 Jun 2019 23:15:33 -
@@ -6,9 +6,13 @@ ONLY_FOR_ARCHS = amd64
COMMENT = software reverse engineering (SRE) framework
VERSION = 9.0.4
-REVISION = 0
-DISTNAME = ghidra_9.0.4_PUBLIC_20190516
-PKGNAME = ghidra-${VERSION}
+GHIDRA_DATE = 20190516
+REVISION = 1
+
+GH_ACCOUNT = NationalSecurityAgency
+GH_PROJECT = ghidra
+GH_TAGNAME = Ghidra_${VERSION}_build
+DISTNAME = ghidra-${VERSION}
CATEGORIES = security
@@ -17,32 +21,115 @@ HOMEPAGE = https://www.ghidra-sre.org/
MAINTAINER = Remi Pointel
# Apache v2
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
+
+WANTLIB += c m stdc++
-MASTER_SITES = ${HOMEPAGE}
+MASTER_SITES0 =${HOMEPAGE}
+MASTER_SITES1 =
https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
+MASTER_SITES2 =https://repo.maven.apache.org/maven2/
EXTRACT_SUFX = .zip
+ST4_VER = 4.1
+HAMCREST_VER = 1.3
+JAVACC_VER = 5.0
+JMOCKIT_VER = 1.44
+JSON_SIMPLE_VER = 1.1.1
+JUNIT_VER =4.12
+YAJSW_VER =12.12
+
+JAR_DISTFILES += ST4{org/antlr/ST4/${ST4_VER}/ST4}-${ST4_VER}.jar
+JAR_DISTFILES +=
hamcrest{org/hamcrest/hamcrest-all/${HAMCREST_VER}/hamcrest}-all-${HAMCREST_VER}.jar
+JAR_DISTFILES +=
javacc{net/java/dev/javacc/javacc/${JAVACC_VER}/javacc}-${JAVACC_VER}.jar
+JAR_DISTFILES +=
jmockit{org/jmockit/jmockit/${JMOCKIT_VER}/jmockit}-${JMOCKIT_VER}.jar
+JAR_DISTFILES +=
json-simple{com/googlecode/json-simple/json-simple/${JSON_SIMPLE_VER}/json-simple}-${JSON_SIMPLE_VER}.jar
+JAR_DISTFILES += junit{junit/junit/${JUNIT_VER}/junit}-${JUNIT_VER}.jar
+
+DISTFILES =${DISTNAME}.tar.gz
+DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
+DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
+DISTFILES += ${JAR_DISTFILES:C/$/:2/}
+
+EXTRACT_ONLY = ${DISTNAME}.tar.gz
+
MODULES = java
MODJAVA_VER = 11+
+BUILD_DEPENDS =archivers/unzip \
+ devel/bison \
+ java/gradle \
+ shells/bash
+
RUN_DEPENDS = shells/bash \
java/javaPathHelper
-NO_BUILD = Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/${PKGNAME:S/-/_/}
+SUBST_VARS += GHIDRA_DATE VERSION WRKDIR
+
+JAR_DIRS +=Features-FileFormats
+JAR_DIRS +=Features-Python
+JAR_DIRS +=Framework-Docking
+JAR_DIRS +=Framework-FileSystem
+JAR_DIRS +=Framework-Generic
+JAR_DIRS +=Framework-Graph
+JAR_DIRS +=Framework-Project
+JAR_DIRS +=Framework-SoftwareModeling
post-extract:
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/ghidraRun
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/ghidraRun
+ @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/support/launch.sh
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
+ @perl -pi -e 's,(applic
Re: [NEW] security/ghidra
On Mon, Jun 17, 2019 at 08:10:45PM -0600, Anthony J. Bentley wrote:
> Lawrence Teo writes:
> > Here is an updated diff now that Gradle has been imported.
>
> It doesn't build for me.
Hi Anthony,
Thanks for testing! I checked your build log and found that the Ghidra
build process tries to fetch dependent files on demand while building.
I was able to replicate your build failure when I tried building the
port as _pbuild.
Here's an updated diff that makes the port fetch all the dependent
.jar files prior to building.
I also used gradle's --offline flag which explicitly tells gradle to
"Execute the build without accessing network resources".
Could you please try this diff to see if it resolves your issue?
Thank you,
Lawrence
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Jun 2019 00:38:36 - 1.3
+++ Makefile20 Jun 2019 01:40:09 -
@@ -6,9 +6,13 @@ ONLY_FOR_ARCHS = amd64
COMMENT = software reverse engineering (SRE) framework
VERSION = 9.0.4
-REVISION = 0
-DISTNAME = ghidra_9.0.4_PUBLIC_20190516
-PKGNAME = ghidra-${VERSION}
+GHIDRA_DATE = 20190516
+REVISION = 1
+
+GH_ACCOUNT = NationalSecurityAgency
+GH_PROJECT = ghidra
+GH_TAGNAME = Ghidra_${VERSION}_build
+DISTNAME = ghidra-${VERSION}
CATEGORIES = security
@@ -17,32 +21,115 @@ HOMEPAGE = https://www.ghidra-sre.org/
MAINTAINER = Remi Pointel
# Apache v2
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
+
+WANTLIB += c m stdc++
-MASTER_SITES = ${HOMEPAGE}
+MASTER_SITES0 =${HOMEPAGE}
+MASTER_SITES1 =
https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
+MASTER_SITES2 =https://repo.maven.apache.org/maven2/
EXTRACT_SUFX = .zip
+ST4_VER = 4.1
+HAMCREST_VER = 1.3
+JAVACC_VER = 5.0
+JMOCKIT_VER = 1.44
+JSON_SIMPLE_VER = 1.1.1
+JUNIT_VER =4.12
+YAJSW_VER =12.12
+
+JAR_DISTFILES += ST4{org/antlr/ST4/${ST4_VER}/ST4}-${ST4_VER}.jar
+JAR_DISTFILES +=
hamcrest{org/hamcrest/hamcrest-all/${HAMCREST_VER}/hamcrest}-all-${HAMCREST_VER}.jar
+JAR_DISTFILES +=
javacc{net/java/dev/javacc/javacc/${JAVACC_VER}/javacc}-${JAVACC_VER}.jar
+JAR_DISTFILES +=
jmockit{org/jmockit/jmockit/${JMOCKIT_VER}/jmockit}-${JMOCKIT_VER}.jar
+JAR_DISTFILES +=
json-simple{com/googlecode/json-simple/json-simple/${JSON_SIMPLE_VER}/json-simple}-${JSON_SIMPLE_VER}.jar
+JAR_DISTFILES += junit{junit/junit/${JUNIT_VER}/junit}-${JUNIT_VER}.jar
+
+DISTFILES =${DISTNAME}.tar.gz
+DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
+DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
+DISTFILES += ${JAR_DISTFILES:C/$/:2/}
+
+EXTRACT_ONLY = ${DISTNAME}.tar.gz
+
MODULES = java
MODJAVA_VER = 11+
+BUILD_DEPENDS =archivers/unzip \
+ devel/bison \
+ java/gradle \
+ shells/bash
+
RUN_DEPENDS = shells/bash \
java/javaPathHelper
-NO_BUILD = Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/${PKGNAME:S/-/_/}
+SUBST_VARS += GHIDRA_DATE VERSION WRKDIR
+
+JAR_DIRS +=Features-FileFormats
+JAR_DIRS +=Features-Python
+JAR_DIRS +=Framework-Docking
+JAR_DIRS +=Framework-FileSystem
+JAR_DIRS +=Framework-Generic
+JAR_DIRS +=Framework-Graph
+JAR_DIRS +=Framework-Project
+JAR_DIRS +=Framework-SoftwareModeling
post-extract:
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/ghidraRun
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/ghidraRun
+ @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
- ${WRKSRC}/support/launch.sh
+ ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh
+ @perl -pi -e 's,(application.version)=.*,\1=${VERSION},' \
+ ${WRKSRC}/Ghidra/application.properties
+
+# Steps derived from:
+# https://github.com/NationalSecurityAgency/ghidra/blob/master/DevGuide.md
+pre-build:
+ cp ${FILESDIR}/repos.gradle ${WRKDIR}
+ ${SUBST_CMD} ${WRKDIR}/repos.gradle \
+
${WRKSRC}/Ghidra/Framework/Help/src/main/java/help/GHelpBuilder.java
+ mkdir ${WRKDIR}/{flatRepo,gradle,home}
+.for dir in ${JAR_DIRS}
+ unzip -j ${DISTDIR}/ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}.zip \
+ -d ${WRKDIR}/flatRepo \
+
ghidra_
Re: [NEW] security/ghidra
On Sat, Jun 15, 2019 at 09:26:18PM +0200, Remi Pointel wrote:
> On 6/15/19 4:56 PM, Lawrence Teo wrote:
> > On Tue, May 14, 2019 at 07:59:57PM +0200, Remi Pointel wrote:
> > > On 5/14/19 7:48 PM, Jeremy O'Brien wrote:
> > > > On Tue, May 14, 2019, at 12:43, Anthony J. Bentley wrote:
> > > > > Jeremy O'Brien writes:
> > > > > > I noticed this port was committed today. I have to
> > > > > > ask, did you actually try to use it? In its current
> > > > > > state, (sans my above changes), there is no decompiler
> > > > > > nor symbol demangler. This might have been OK to omit,
> > > > > > except for the fact that you will get a "Could not
> > > > > > find decompiler executable decompile" popup every
> > > > > > single time you click anywhere in the disassembly pane,
> > > > > > which makes this port unusable.
> > > > >
> > > > > Indeed they are very annoying. I agree the port is not
> > > > > "finished." But I've used Ghidra to do some minor work despite that,
> > > > > so
> > > > > I'm happy to see it in. Revising the port to add the native tools
> > > > > would
> > > > > be very welcome though.
> > > > >
> > > > >
> > > >
> > > > If you're willing to compile it yourself, my MR here:
> > > > https://github.com/NationalSecurityAgency/ghidra/pull/490 makes the
> > > > native components build perfectly in OpenBSD. Just follow the ghidra
> > > > DevGuide.md instructions after applying the patch. I also have my
> > > > personal build here (but that of course requires that you trust a
> > > > stranger on the internet):
> > > > https://pintobyte.com/tmp/ghidra_9.1-DEV_PUBLIC_20190513_openbsd64.zip
> > > > if you don't feel like compiling but want the "full" ghidra experience.
> > > > I do like that the current ghidra port requires no compilation, as the
> > > > compilation process is a bit heavy-handed and takes some time to
> > > > complete, but I personally would prefer to see a fully-working port
> > > > over a fast-installing one.
> > > >
> > >
> > > Thank you for feedback, I will try your patch to build ghidra and I will
> > > let
> > > you know.
> > > If you are motivated, you can send a diff that applies on the ghidra port
> > > to
> > > integrate your work.
> > >
> > > Cheers,
> > >
> > > Remi.
> > >
> >
> > Here's my attempt to update Ghidra to add a native decompiler for
> > OpenBSD. I created the patches based on Jeremy's pull request and used
> > https://github.com/NationalSecurityAgency/ghidra/blob/master/DevGuide.md
> > to figure out the build steps.
> >
> > I also did the following to make it build and conform to OpenBSD port
> > conventions:
> >
> > 1. Ghidra is built using Gradle so I have attached a new port for
> > devel/gradle 5.4.1.
> >
> > 2. DevGuide.md says they built Ghidra with Gradle 5.0 but I was able to
> > build it successfully with Gradle 5.4.1.
> >
> > 3. To prevent the build process from touching $HOME, I made gradle use
> > ${WRKDIR}/gradle as its home and also modified GHelpBuilder.java
> > (the program that builds help files during build) to log to ${WRKDIR}
> > instead of $HOME/.ghidra.
> >
> > 4. One of the Gradle scripts (ip.gradle) scans the Ghidra source tree so
> > I had to explicitly tell it to exclude *.orig and *.beforesubst.
> >
> > 5. The port has to be built with a high `ulimit -d` (I set it to
> > `ulimit -Hd` which on my system is 33554432).
> >
> > Using the resulting package I was able to decompile programs without
> > encountering the "Could not find decompiler executable decompile" popup.
> >
> > Tests/reviews/feedback welcome! :)
>
> Hi,
>
> quickly tested and sounds good to me, thanks a lot for your work.
>
> Cheers,
>
> Remi.
Remi, thank you for testing!
Here is an updated diff now that Gradle has been imported.
The only change is the BUILD_DEPENDS for Gradle which I've changed from
devel/gradle to java/gradle.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Jun 2019 00:38:36 - 1.3
+++ Makefile17 J
Re: [NEW] security/ghidra
Thank you Stuart! I have imported java/gradle with your tweak.
On Sun, Jun 16, 2019 at 11:12:09AM +0100, Stuart Henderson wrote:
> Oh, maybe worth considering putting it in java/ instead of devel/.
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 16 June 2019 10:47:15 Stuart Henderson wrote:
>
> > Here's a small tweak for gradle, then it's ok with me to import.
> >
> > diff --git a/Makefile b/Makefile
> > index 06e0699..e4e5daf 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -2,9 +2,8 @@
> >
> > COMMENT = build automation tool
> >
> > -V =5.4.1
> > -DISTNAME = gradle-${V}-bin
> > -PKGNAME = gradle-${V}
> > +DISTNAME = gradle-5.4.1
> > +EXTRACT_SUFX = -bin.zip
> >
> > CATEGORIES =devel
> >
> > @@ -15,17 +14,12 @@ PERMIT_PACKAGE =Yes
> >
> > MASTER_SITES = https://services.gradle.org/distributions/
> >
> > -EXTRACT_SUFX = .zip
> > -
> > MODULES = java
> > MODJAVA_VER = 1.8+
> >
> > NO_BUILD = Yes
> > NO_TEST = Yes
> >
> > -WRKDIST = ${WRKDIR}/gradle-${V}
> > -WRKSRC = ${WRKDIST}
> > -
> > RUN_DEPENDS = java/javaPathHelper
> >
> > do-install:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/06/16 20:07:21 Modified files: java : Makefile Log message: +gradle
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/06/16 20:03:44 Log message: Import java/gradle, a build automation tool. Includes tweaks by sthen@. ok kn@ sthen@ Gradle is an open-source build automation tool focused on flexibility and performance. Status: Vendor Tag: lteo Release Tags: lteo_20190616 N ports/java/gradle/Makefile N ports/java/gradle/distinfo N ports/java/gradle/pkg/DESCR N ports/java/gradle/pkg/PLIST N ports/java/gradle/patches/patch-bin_gradle No conflicts created by this import
Re: [NEW] security/ghidra
On Tue, May 14, 2019 at 07:59:57PM +0200, Remi Pointel wrote:
> On 5/14/19 7:48 PM, Jeremy O'Brien wrote:
> > On Tue, May 14, 2019, at 12:43, Anthony J. Bentley wrote:
> > > Jeremy O'Brien writes:
> > > > I noticed this port was committed today. I have to
> > > > ask, did you actually try to use it? In its current
> > > > state, (sans my above changes), there is no decompiler
> > > > nor symbol demangler. This might have been OK to omit,
> > > > except for the fact that you will get a "Could not
> > > > find decompiler executable decompile" popup every
> > > > single time you click anywhere in the disassembly pane,
> > > > which makes this port unusable.
> > >
> > > Indeed they are very annoying. I agree the port is not
> > > "finished." But I've used Ghidra to do some minor work despite that, so
> > > I'm happy to see it in. Revising the port to add the native tools would
> > > be very welcome though.
> > >
> > >
> >
> > If you're willing to compile it yourself, my MR here:
> > https://github.com/NationalSecurityAgency/ghidra/pull/490 makes the native
> > components build perfectly in OpenBSD. Just follow the ghidra DevGuide.md
> > instructions after applying the patch. I also have my personal build here
> > (but that of course requires that you trust a stranger on the internet):
> > https://pintobyte.com/tmp/ghidra_9.1-DEV_PUBLIC_20190513_openbsd64.zip if
> > you don't feel like compiling but want the "full" ghidra experience. I do
> > like that the current ghidra port requires no compilation, as the
> > compilation process is a bit heavy-handed and takes some time to complete,
> > but I personally would prefer to see a fully-working port over a
> > fast-installing one.
> >
>
> Thank you for feedback, I will try your patch to build ghidra and I will let
> you know.
> If you are motivated, you can send a diff that applies on the ghidra port to
> integrate your work.
>
> Cheers,
>
> Remi.
>
Here's my attempt to update Ghidra to add a native decompiler for
OpenBSD. I created the patches based on Jeremy's pull request and used
https://github.com/NationalSecurityAgency/ghidra/blob/master/DevGuide.md
to figure out the build steps.
I also did the following to make it build and conform to OpenBSD port
conventions:
1. Ghidra is built using Gradle so I have attached a new port for
devel/gradle 5.4.1.
2. DevGuide.md says they built Ghidra with Gradle 5.0 but I was able to
build it successfully with Gradle 5.4.1.
3. To prevent the build process from touching $HOME, I made gradle use
${WRKDIR}/gradle as its home and also modified GHelpBuilder.java
(the program that builds help files during build) to log to ${WRKDIR}
instead of $HOME/.ghidra.
4. One of the Gradle scripts (ip.gradle) scans the Ghidra source tree so
I had to explicitly tell it to exclude *.orig and *.beforesubst.
5. The port has to be built with a high `ulimit -d` (I set it to
`ulimit -Hd` which on my system is 33554432).
Using the resulting package I was able to decompile programs without
encountering the "Could not find decompiler executable decompile" popup.
Tests/reviews/feedback welcome! :)
Thanks,
Lawrence
gradle-5.4.1.tar.gz
Description: application/tar-gz
Index: Makefile
===
RCS file: /cvs/ports/security/ghidra/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Jun 2019 00:38:36 - 1.3
+++ Makefile15 Jun 2019 01:20:42 -
@@ -6,9 +6,14 @@ ONLY_FOR_ARCHS = amd64
COMMENT = software reverse engineering (SRE) framework
VERSION = 9.0.4
-REVISION = 0
-DISTNAME = ghidra_9.0.4_PUBLIC_20190516
-PKGNAME = ghidra-${VERSION}
+GHIDRA_DATE = 20190516
+YAJSW_VER =12.12
+REVISION = 1
+
+GH_ACCOUNT = NationalSecurityAgency
+GH_PROJECT = ghidra
+GH_TAGNAME = Ghidra_${VERSION}_build
+DISTNAME = ghidra-${VERSION}
CATEGORIES = security
@@ -17,32 +22,85 @@ HOMEPAGE = https://www.ghidra-sre.org/
MAINTAINER = Remi Pointel
# Apache v2
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
-MASTER_SITES = ${HOMEPAGE}
+WANTLIB += c m stdc++
+
+MASTER_SITES0 =${HOMEPAGE}
+MASTER_SITES1 =
https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
EXTRACT_SUFX = .zip
+DISTFILES =${DISTNAME}.tar.gz
+DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
+DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
+
+EXTRACT_ONLY = ${DISTNAME}.tar.gz
+
MODULES = java
MODJAVA_VER = 11+
+BUILD_DEPENDS =devel/bison \
+ devel/gradle \
+ shells/bash
+
RUN_DEPENDS = shells/bash \
java/javaPathHelper
-NO_BUILD = Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/${PKGNAME:S/-/_/}
+SUBST_VARS
Re: UPDATE: SQLMap-1.3.6
On Tue, Jun 04, 2019 at 02:42:38PM +0200, Gonzalo L. Rodriguez wrote:
> Hello,
>
> Update for SQLMap to 1.3.5:
>
> https://github.com/sqlmapproject/sqlmap/releases/tag/1.3.6
>
> OK? Comments?
I've tested this lightly and it's working fine for me.
>
> Cheers.-
>
> --
>
> - gonzalo
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/sqlmap/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile 9 May 2019 14:03:14 - 1.19
> +++ Makefile 4 Jun 2019 12:40:39 -
> @@ -4,7 +4,7 @@ COMMENT = penetration testing tool to d
>
> GH_ACCOUNT = sqlmapproject
> GH_PROJECT = sqlmap
> -GH_TAGNAME = 1.3.5
> +GH_TAGNAME = 1.3.6
>
> CATEGORIES = security
>
> @@ -14,6 +14,7 @@ HOMEPAGE = http://sqlmap.org/
> PERMIT_PACKAGE_CDROM = Yes
>
> MODULES =lang/python
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> MODPY_ADJ_FILES = sqlmap.py
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/sqlmap/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- distinfo 9 May 2019 14:03:14 - 1.15
> +++ distinfo 4 Jun 2019 12:40:39 -
> @@ -1,2 +1,2 @@
> -SHA256 (sqlmap-1.3.5.tar.gz) = NMEW896DGuPqtyFrkzylo9u2qRr0lw+1nbdGURABj/g=
> -SIZE (sqlmap-1.3.5.tar.gz) = 7430961
> +SHA256 (sqlmap-1.3.6.tar.gz) = JlN42T1POgJevf1eUCpntMA9FNZjgWFcT08S5jZwvdQ=
> +SIZE (sqlmap-1.3.6.tar.gz) = 7452711
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/sqlmap/pkg/PLIST,v
> retrieving revision 1.15
> diff -u -p -r1.15 PLIST
> --- pkg/PLIST 9 May 2019 14:03:14 - 1.15
> +++ pkg/PLIST 4 Jun 2019 12:40:39 -
> @@ -4,41 +4,174 @@ share/sqlmap/
> share/sqlmap/.github/
> share/sqlmap/.github/CODE_OF_CONDUCT.md
> share/sqlmap/.github/CONTRIBUTING.md
> -share/sqlmap/.github/ISSUE_TEMPLATE.md
> +share/sqlmap/.github/ISSUE_TEMPLATE/
> +share/sqlmap/.github/ISSUE_TEMPLATE/bug_report.md
> +share/sqlmap/.github/ISSUE_TEMPLATE/feature_request.md
> +share/sqlmap/.pylintrc
> share/sqlmap/.travis.yml
> share/sqlmap/COMMITMENT
> share/sqlmap/LICENSE
> +${MODPY_COMMENT}share/sqlmap/${MODPY_PYCACHE}/
> +share/sqlmap/${MODPY_PYCACHE}sqlmap.${MODPY_PYC_MAGIC_TAG}pyc
> +share/sqlmap/${MODPY_PYCACHE}sqlmapapi.${MODPY_PYC_MAGIC_TAG}pyc
> +share/sqlmap/data/
> +share/sqlmap/data/procs/
> +share/sqlmap/data/procs/README.txt
> +share/sqlmap/data/procs/mssqlserver/
> +share/sqlmap/data/procs/mssqlserver/activate_sp_oacreate.sql
> +share/sqlmap/data/procs/mssqlserver/configure_openrowset.sql
> +share/sqlmap/data/procs/mssqlserver/configure_xp_cmdshell.sql
> +share/sqlmap/data/procs/mssqlserver/create_new_xp_cmdshell.sql
> +share/sqlmap/data/procs/mssqlserver/disable_xp_cmdshell_2000.sql
> +share/sqlmap/data/procs/mssqlserver/dns_request.sql
> +share/sqlmap/data/procs/mssqlserver/enable_xp_cmdshell_2000.sql
> +share/sqlmap/data/procs/mssqlserver/run_statement_as_user.sql
> +share/sqlmap/data/procs/mysql/
> +share/sqlmap/data/procs/mysql/dns_request.sql
> +share/sqlmap/data/procs/mysql/write_file_limit.sql
> +share/sqlmap/data/procs/oracle/
> +share/sqlmap/data/procs/oracle/dns_request.sql
> +share/sqlmap/data/procs/postgresql/
> +share/sqlmap/data/procs/postgresql/dns_request.sql
> +share/sqlmap/data/shell/
> +share/sqlmap/data/shell/README.txt
> +share/sqlmap/data/shell/backdoors/
> +share/sqlmap/data/shell/backdoors/backdoor.asp_
> +share/sqlmap/data/shell/backdoors/backdoor.aspx_
> +share/sqlmap/data/shell/backdoors/backdoor.jsp_
> +share/sqlmap/data/shell/backdoors/backdoor.php_
> +share/sqlmap/data/shell/stagers/
> +share/sqlmap/data/shell/stagers/stager.asp_
> +share/sqlmap/data/shell/stagers/stager.aspx_
> +share/sqlmap/data/shell/stagers/stager.jsp_
> +share/sqlmap/data/shell/stagers/stager.php_
> +share/sqlmap/data/txt/
> +share/sqlmap/data/txt/common-columns.txt
> +share/sqlmap/data/txt/common-outputs.txt
> +share/sqlmap/data/txt/common-tables.txt
> +share/sqlmap/data/txt/keywords.txt
> +share/sqlmap/data/txt/smalldict.txt
> +share/sqlmap/data/txt/user-agents.txt
> +share/sqlmap/data/txt/wordlist.tx_
> +share/sqlmap/data/udf/
> +share/sqlmap/data/udf/README.txt
> +share/sqlmap/data/udf/mysql/
> +share/sqlmap/data/udf/mysql/linux/
> +share/sqlmap/data/udf/mysql/linux/32/
> +share/sqlmap/data/udf/mysql/linux/32/lib_mysqludf_sys.so_
> +share/sqlmap/data/udf/mysql/linux/64/
> +share/sqlmap/data/udf/mysql/linux/64/lib_mysqludf_sys.so_
> +share/sqlmap/data/udf/mysql/windows/
> +share/sqlmap/data/udf/mysql/windows/32/
> +share/sqlmap/data/udf/mysql/windows/32/lib_mysqludf_sys.dll_
> +share/sqlmap/data/udf/mysql/windows/64/
> +share/sqlmap/data/udf/mysql/windows/64/lib_mysqludf_sys.dll_
> +share/sqlmap/data/udf/postgresql/
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/06/05 20:24:00 Modified files: security/burpsuite: Makefile Log message: Burp Suite Community Edition needs jdk 1.8 to run properly, so set its MODJAVA_VER to 1.8; feedback/ok ian@ While here: * Add a reminder about checking if future updates will work with jdk 11 (text borrowed from sthen@) * Switch to the new PERMIT_* markers (thanks to naddy@ for confirming that this is the right way to do this) * Change the HOMEPAGE to use https
Re: security/burpsuite MODJAVA_VER
On Sun, Jun 02, 2019 at 08:21:25AM -0400, Ian Darwin wrote: > On Sat, Jun 01, 2019 at 11:34:30PM -0400, Lawrence Teo wrote: > > Burp Suite Community Edition needs jdk 1.8 to run properly. Using it > > with jdk 11 will show this message on startup: > > > > WARNING: An illegal reflective access operation has occurred > > WARNING: Illegal reflective access by burp.uie > > (file:/usr/local/share/java/classes/burpsuite.jar) to field > > javax.crypto.JceSecurity.isRestricted > > WARNING: Please consider reporting this to the maintainers of burp.uie > > WARNING: Use --illegal-access=warn to enable warnings of further illegal > > reflective access operations > > WARNING: All illegal access operations will be denied in a future release > > That message is just a warning, appears all over Java land these days, and > is due to Java 9+ enforcing inter-class security more (if a library author > wants to expose classes to introspection by client classes, the library has > to list those classes as 'open' in the library's module info file, in > addition to the previously-required 'public' specification). These will get > cleaned up over time. Ah, good to know! Thank you for the insight. > > In addition, attempting to intercept HTTPS will make the browser show an > > error code SSL_ERROR_RX_RECORD_TOO_LONG (I tested with Firefox). > > According to [1], this is due to using the free edition of Burp Suite > > with jdk 11. > > > > The diff below fixes this by setting MODJAVA_VER to 1.8 which resolves > > both issues. While here I have also: > > Before reverting to a relatively old version of Java, did you try > adding the options shown in the link you cited, e.g -Xms16 -Xms4G > -XX:MaxPermSize=1024M? > Actually that looks a typo, I suspect it was meant to be -Xms1G -Xmx4G > (these are start and max memory allocation). I don't have 'burp' installed > or I'd d try it. Thanks. I tried what you suggested: /usr/local/jdk-11/bin/java -Xms1G -Xmx4G -XX:MaxPermSize=1024M -jar \ /usr/local/share/java/classes/burpsuite.jar I got the same result where Firefox showed the Secure Connection Failed page with error code SSL_ERROR_RX_RECORD_TOO_LONG. I noticed that the person who posted those -X options in that thread was using Burp Suite Professional Edition instead of the Community Edition. According to an Apr 9, 2019 post by Paul Johnston (a Support Center agent) in that thread: "The latest versions of Burp Professional have fixes so that Burp correctly works with the latest Java versions. At the moment there isn't a Community Edition release with these features." So it seems like that error is unfortunately related to the Java version itself. Do you have other ideas or suggestions on how to overcome this instead of reverting to jdk 1.8?
security/burpsuite MODJAVA_VER
Burp Suite Community Edition needs jdk 1.8 to run properly. Using it
with jdk 11 will show this message on startup:
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by burp.uie
(file:/usr/local/share/java/classes/burpsuite.jar) to field
javax.crypto.JceSecurity.isRestricted
WARNING: Please consider reporting this to the maintainers of burp.uie
WARNING: Use --illegal-access=warn to enable warnings of further illegal
reflective access operations
WARNING: All illegal access operations will be denied in a future release
Your JRE appears to be version 11.0.3 from Oracle Corporation
Burp has not been fully tested on this platform and you may experience problems.
In addition, attempting to intercept HTTPS will make the browser show an
error code SSL_ERROR_RX_RECORD_TOO_LONG (I tested with Firefox).
According to [1], this is due to using the free edition of Burp Suite
with jdk 11.
The diff below fixes this by setting MODJAVA_VER to 1.8 which resolves
both issues. While here I have also:
* Used sthen@'s XXX message about checking if future updates will work
with jdk 11
* Changed the HOMEPAGE to https
* Switched to the new PERMIT_* markers
ok?
1.
https://support.portswigger.net/customer/portal/questions/17434431-gettin-error-code-ssl-error-rx-record-too-long
Index: Makefile
===
RCS file: /cvs/ports/security/burpsuite/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile24 Mar 2019 22:24:14 - 1.26
+++ Makefile2 Jun 2019 03:04:52 -
@@ -5,16 +5,16 @@ COMMENT = tool for testing security of
VERSION = 1.7.36
DISTNAME = burpsuite_free_v${VERSION}
PKGNAME = burpsuite-${VERSION}
+REVISION = 0
DISTFILES=${DISTNAME}${EXTRACT_SUFX}{Download?productId=100\=${VERSION}\=Jar}
CATEGORIES = security
-HOMEPAGE = http://portswigger.net/burp/
+HOMEPAGE = https://portswigger.net/burp/
-PERMIT_PACKAGE_CDROM= https://portswigger.net/burp/eula-free.html
-PERMIT_PACKAGE_FTP= https://portswigger.net/burp/eula-free.html
-PERMIT_DISTFILES_FTP= https://portswigger.net/burp/eula-free.html
+PERMIT_PACKAGE = https://portswigger.net/burp/eula-free.html
+PERMIT_DISTFILES = https://portswigger.net/burp/eula-free.html
MASTER_SITES = https://portswigger.net/Burp/Releases/
@@ -22,7 +22,8 @@ EXTRACT_ONLY =
EXTRACT_SUFX = .jar
MODULES = java
-MODJAVA_VER = 1.8+
+# XXX if updating, please check if it works with jdk 11 and switch to "1.8+"
if ok
+MODJAVA_VER = 1.8
MODJAVA_JRERUN = yes
RUN_DEPENDS = java/javaPathHelper
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/06/01 20:07:44 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_dynamic-plugins_sf_engine_Makefile_in patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_appid_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in patch-src_preprocessors_Stream6_snort_stream_tcp_c patch-src_preprocessors_spp_sfportscan_c patch-src_util_c patch-src_util_h Log message: Update to Snort 2.9.13 from maintainer Markus Lude, with a note in patch-src_dynamic-plugins_sf_engine_Makefile_in to indicate that libsf_sorules is disabled.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/05/25 20:07:44 Modified files: security/ghidra: Makefile distinfo security/ghidra/pkg: PLIST Log message: Update to Ghidra 9.0.4. ok rpointel@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/05/11 20:08:29 Modified files: telephony/siproxd: Makefile Log message: Drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2019/05/11 20:08:13 Modified files: telephony/libosip2: Makefile Log message: Drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2018/04/15 14:37:55 Added files: math/libqalculate/patches: patch-libqalculate_MathStructure_cc Log message: Fix build for clang6; fix matches libqalculate-0.9.8 and the latest upstream code. ok tb@
clang6 fix: math/libqalculate
This lets math/libqalculate build with clang6.
The error is:
/usr/ports/pobj/libqalculate-0.9.7/libqalculate-0.9.7/libqalculate/MathStructure.cc:7166:48:
error: cannot initialize a parameter of type 'MathStructure *' with an rvalue
of type 'bool'
MathStructure::gcd(cont_c, cont_d, gamma, eo, false);
^
The function prototype of MathStructure::gcd in MathStructure.h is:
static bool gcd(const MathStructure , const MathStructure ,
MathStructure , const EvaluationOptions ,
MathStructure *ca = NULL, MathStructure *cb = NULL,
bool check_args = true);
Their latest Github code and libqalculate-0.9.8 indicate that it is
meant to be:
MathStructure::gcd(cont_c, cont_d, gamma, eo, NULL, NULL, false);
References:
*
https://github.com/Qalculate/libqalculate/blob/master/libqalculate/MathStructure.cc#L9883
* libqalculate-0.9.8/libqalculate/MathStructure.cc in
https://github.com/Qalculate/libqalculate/files/316260/libqalculate-0.9.8.tar.gz
ok?
Index: patches/patch-libqalculate_MathStructure_cc
===
RCS file: patches/patch-libqalculate_MathStructure_cc
diff -N patches/patch-libqalculate_MathStructure_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libqalculate_MathStructure_cc 15 Apr 2018 19:02:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libqalculate/MathStructure.cc
+--- libqalculate/MathStructure.cc.orig
libqalculate/MathStructure.cc
+@@ -7163,7 +7163,7 @@ bool sr_gcd(const MathStructure , const MathStructu
+ c.polynomialContent(xvar, cont_c, eo);
+ d.polynomialContent(xvar, cont_d, eo);
+ MathStructure gamma;
+- MathStructure::gcd(cont_c, cont_d, gamma, eo, false);
++ MathStructure::gcd(cont_c, cont_d, gamma, eo, NULL, NULL, false);
+ if(ddeg.isZero()) {
+ mgcd = gamma;
+ return true;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2018/01/27 20:09:12 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_decode_h patch-src_dynamic-plugins_sf_engine_Makefile_in patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in patch-src_preprocessors_Stream6_snort_stream_tcp_c patch-src_preprocessors_spp_sfportscan_c net/snort/pkg : README snort.rc Log message: Update to Snort 2.9.11.1, maintainer timeout. Also sync pkg/README with reality, add daemon_timeout=120 to the rc.d script (since Snort can take a while to start with the current rules), and update/regenerate patches.
UPDATE: net/snort 2.9.11.1
This updates Snort to 2.9.11.1.
Release notes + changelog:
https://www.snort.org/downloads/snort/release_notes_2.9.11.1.txt
https://www.snort.org/downloads/snort/changelog_2.9.11.1.txt
In addition, the diff also syncs pkg/README with reality, adds
daemon_timeout=120 to the rc script (since Snort can take a long time
to start with the current rules), and updates/regenerates patches.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile23 Jan 2017 11:22:58 - 1.97
+++ Makefile11 Jan 2018 02:14:22 -
@@ -2,13 +2,12 @@
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.9.0
+VERSION = 2.9.11.1
DISTNAME = snort-${VERSION}
-REVISION = 0
CATEGORIES = net security
-HOMEPAGE = http://www.snort.org/
+HOMEPAGE = https://www.snort.org/
MAINTAINER = Markus Lude
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo5 Jan 2017 03:08:04 - 1.36
+++ distinfo11 Jan 2018 02:15:07 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.9.0.tar.gz) = cbFHEl6WOQoS89VXlu1Qc993IGvTVj2E0+Wh8Z59elY=
-SIZE (snort-2.9.9.0.tar.gz) = 6364482
+SHA256 (snort-2.9.11.1.tar.gz) = n2s66sWhCfVVBL03BWSsQxyxdzUHkp3EYWJomPM/Rs0=
+SIZE (snort-2.9.11.1.tar.gz) = 6442755
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_decode_h
--- patches/patch-src_decode_h 5 Jan 2017 03:08:04 - 1.10
+++ patches/patch-src_decode_h 11 Jan 2018 02:28:39 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_decode_h,v 1.10 2017/01/05 03:08:04 lteo Exp $
src/decode.h.orig Tue Jun 7 03:47:47 2016
-+++ src/decode.h Sun Dec 4 00:36:43 2016
-@@ -834,9 +834,9 @@ typedef struct _SLLHdr {
+Index: src/decode.h
+--- src/decode.h.orig
src/decode.h
+@@ -835,9 +835,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-plugins_sf_engine_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 2 May 2016
02:29:58 - 1.10
+++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 11 Jan 2018
02:28:36 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.10 2016/05/02
02:29:58 lteo Exp $
src/dynamic-plugins/sf_engine/Makefile.in.orig Fri Mar 18 15:11:29 2016
-+++ src/dynamic-plugins/sf_engine/Makefile.in Fri Apr 29 11:02:26 2016
-@@ -376,7 +376,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-plugins/sf_engine/Makefile.in
+--- src/dynamic-plugins/sf_engine/Makefile.in.orig
src/dynamic-plugins/sf_engine/Makefile.in
+@@ -388,7 +388,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicengine_LTLIBRARIES = libsf_engine.la
dynamicenginedir = $(libdir)/snort_dynamicengine
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.16
diff -u -p -r1.16 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 2 May 2016 02:29:58
- 1.16
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 11 Jan 2018 02:28:36
-
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.16 2016/05/02
02:29:58 lteo Exp $
src/dynamic-preprocessors/Makefile.in.orig Fri Mar 18 15:11:29 2016
-+++ src/dynamic-preprocessors/Makefile.in Fri Apr 29 11:02:26 2016
-@@ -1528,19 +1528,8 @@ clean-local:
+Index: src/dynamic-preprocessors/Makefile.in
+--- src/dynamic-preprocessors/Makefile.in.orig
src/dynamic-preprocessors/Makefile.in
+@@ -1635,19 +1635,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
---
UPDATE: net/snort 2.9.11
This updates Snort to 2.9.11, along with these changes/fixes:
* Change all HTTP URLs to HTTPS where appropriate.
* Make sure pkg/README uses the correct Snort rule URL for Snort 2.9.11.
* Remove note in pkg/README about registered users only being allowed to
download the snort.org ruleset every 15 minutes; I don't think this is
true anymore.
* Add daemon_timeout=120 to the rc script, since Snort can take a long
time to start with the current rules.
* Update/regenerate patches.
Release notes and changelog at:
https://www.snort.org/downloads/snort/release_notes_2.9.11.txt
https://www.snort.org/downloads/snort/changelog_2.9.11.txt
Tested on amd64.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile23 Jan 2017 11:22:58 - 1.97
+++ Makefile17 Dec 2017 03:33:00 -
@@ -2,13 +2,12 @@
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.9.0
+VERSION = 2.9.11
DISTNAME = snort-${VERSION}
-REVISION = 0
CATEGORIES = net security
-HOMEPAGE = http://www.snort.org/
+HOMEPAGE = https://www.snort.org/
MAINTAINER = Markus Lude
@@ -38,7 +37,13 @@ PREPROC =decoder.rules preprocessor.ru
DOCS = AUTHORS CREDITS README README.* *.pdf TODO USAGE \
WISHLIST
+# If VERSION is 1.2.3.4, set V to "1234". If VERSION is 1.2.3, set V to
"1230".
+# This is needed to generate a valid snort.org rule download URL in pkg/README.
V =${VERSION:S/.//g}
+.if ${VERSION:N[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*}
+V := ${V}0
+.endif
+
SUBST_VARS += V
pre-configure:
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo5 Jan 2017 03:08:04 - 1.36
+++ distinfo17 Dec 2017 03:33:00 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.9.0.tar.gz) = cbFHEl6WOQoS89VXlu1Qc993IGvTVj2E0+Wh8Z59elY=
-SIZE (snort-2.9.9.0.tar.gz) = 6364482
+SHA256 (snort-2.9.11.tar.gz) = I6RePqHhVaPYccaRoQ/iPyv8/k1qvA67zcKrH8zKFO4=
+SIZE (snort-2.9.11.tar.gz) = 6441674
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_decode_h
--- patches/patch-src_decode_h 5 Jan 2017 03:08:04 - 1.10
+++ patches/patch-src_decode_h 17 Dec 2017 03:33:00 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_decode_h,v 1.10 2017/01/05 03:08:04 lteo Exp $
src/decode.h.orig Tue Jun 7 03:47:47 2016
-+++ src/decode.h Sun Dec 4 00:36:43 2016
-@@ -834,9 +834,9 @@ typedef struct _SLLHdr {
+Index: src/decode.h
+--- src/decode.h.orig
src/decode.h
+@@ -835,9 +835,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-plugins_sf_engine_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 2 May 2016
02:29:58 - 1.10
+++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 17 Dec 2017
03:33:00 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.10 2016/05/02
02:29:58 lteo Exp $
src/dynamic-plugins/sf_engine/Makefile.in.orig Fri Mar 18 15:11:29 2016
-+++ src/dynamic-plugins/sf_engine/Makefile.in Fri Apr 29 11:02:26 2016
-@@ -376,7 +376,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-plugins/sf_engine/Makefile.in
+--- src/dynamic-plugins/sf_engine/Makefile.in.orig
src/dynamic-plugins/sf_engine/Makefile.in
+@@ -388,7 +388,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicengine_LTLIBRARIES = libsf_engine.la
dynamicenginedir = $(libdir)/snort_dynamicengine
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.16
diff -u -p -r1.16 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 2 May 2016 02:29:58
- 1.16
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 17 Dec 2017 03:33:00
-
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.16 2016/05/02
02:29:58
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2017/01/04 20:08:04 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_decode_h patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in patch-src_preprocessors_Stream6_snort_stream_tcp_c Log message: Update to Snort 2.9.9.0. Maintainer timeout.
UPDATE: net/snort 2.9.9.0
This updates Snort to 2.9.9.0. Release notes and changelog at:
https://www.snort.org/downloads/snort/release_notes_2.9.9.0.txt
https://www.snort.org/downloads/snort/changelog_2.9.9.0.txt
Tested on amd64.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- Makefile2 Oct 2016 02:06:19 - 1.95
+++ Makefile19 Dec 2016 02:22:20 -
@@ -2,7 +2,7 @@
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.8.3
+VERSION = 2.9.9.0
DISTNAME = snort-${VERSION}
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo2 Oct 2016 02:06:19 - 1.35
+++ distinfo19 Dec 2016 02:22:20 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.8.3.tar.gz) = hW0CzOxJ+jDJIKHkFsR8DWLdIkNAphSVm6XAMjkQDmo=
-SIZE (snort-2.9.8.3.tar.gz) = 6244304
+SHA256 (snort-2.9.9.0.tar.gz) = cbFHEl6WOQoS89VXlu1Qc993IGvTVj2E0+Wh8Z59elY=
+SIZE (snort-2.9.9.0.tar.gz) = 6364482
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_decode_h
--- patches/patch-src_decode_h 2 May 2016 02:29:58 - 1.9
+++ patches/patch-src_decode_h 19 Dec 2016 02:22:20 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_decode_h,v 1.9 2016/05/02 02:29:58 lteo Exp $
src/decode.h.orig Fri Mar 18 09:54:31 2016
-+++ src/decode.h Fri Apr 29 11:02:26 2016
-@@ -831,9 +831,9 @@ typedef struct _SLLHdr {
+--- src/decode.h.orig Tue Jun 7 03:47:47 2016
src/decode.h Sun Dec 4 00:36:43 2016
+@@ -834,9 +834,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 2 May 2016
02:29:58 - 1.12
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 19 Dec 2016
02:22:20 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.12
2016/05/02 02:29:58 lteo Exp $
src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Fri Mar 18 15:11:29 2016
-+++ src/dynamic-preprocessors/dcerpc2/Makefile.in Fri Apr 29 11:02:26 2016
-@@ -335,7 +335,7 @@ top_srcdir = @top_srcdir@
+--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Tue Nov 29 01:12:24 2016
src/dynamic-preprocessors/dcerpc2/Makefile.in Sun Dec 4 00:36:43 2016
+@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_dce2_preproc.la
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dce2_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -581,7 +581,7 @@ distdir: $(DISTFILES)
+@@ -566,7 +566,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in2 May 2016
02:29:58 - 1.10
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in19 Dec 2016
02:22:20 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.10 2016/05/02
02:29:58 lteo Exp $
src/dynamic-preprocessors/dnp3/Makefile.in.origFri Mar 18 15:11:29 2016
-+++ src/dynamic-preprocessors/dnp3/Makefile.in Fri Apr 29 11:02:26 2016
-@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
+--- src/dynamic-preprocessors/dnp3/Makefile.in.origTue Nov 29 01:12:24 2016
src/dynamic-preprocessors/dnp3/Makefile.in Sun Dec 4 00:36:43 2016
+@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_dnp3_preproc.la
@@ -10,7 +10,7 @@ $OpenBSD:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/10/01 20:06:20 Modified files: net/snort : Makefile distinfo net/snort/pkg : PLIST Log message: Update to Snort 2.9.8.3. Also remove README.session from PLIST since it no longer exists. Tested on amd64 by myself and on i386 by maintainer. ok Markus Lude (maintainer)
UPDATE: net/snort 2.9.8.3
This updates Snort to 2.9.8.3. Tested on amd64.
It also removes README.session from the packing list since that file no
longer exists.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.94
diff -u -p -r1.94 Makefile
--- Makefile2 May 2016 02:29:58 - 1.94
+++ Makefile21 Sep 2016 01:55:43 -
@@ -2,7 +2,7 @@
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.8.2
+VERSION = 2.9.8.3
DISTNAME = snort-${VERSION}
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo2 May 2016 02:29:58 - 1.34
+++ distinfo21 Sep 2016 01:56:06 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.8.2.tar.gz) = QHUBLTUN+kegIAt6kgMj8Vy3w3B5DypHNnwDq6QAkzM=
-SIZE (snort-2.9.8.2.tar.gz) = 6311793
+SHA256 (snort-2.9.8.3.tar.gz) = hW0CzOxJ+jDJIKHkFsR8DWLdIkNAphSVm6XAMjkQDmo=
+SIZE (snort-2.9.8.3.tar.gz) = 6244304
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- pkg/PLIST 2 May 2016 02:29:58 - 1.29
+++ pkg/PLIST 21 Sep 2016 01:58:40 -
@@ -105,7 +105,6 @@ share/doc/snort/README.ppm
share/doc/snort/README.reload
share/doc/snort/README.reputation
share/doc/snort/README.sensitive_data
-share/doc/snort/README.session
share/doc/snort/README.sfportscan
share/doc/snort/README.sip
share/doc/snort/README.ssh
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/09/21 20:13:18 Modified files: net/iperf3 : Makefile net/iperf3/patches: patch-src_iperf_api_c Log message: Default to IPv4; suggested by sthen@ Remove unnecessary DISTNAME; pointed out by jca@ ok sthen@
Re: NEW: net/iperf3
On Tue, Sep 20, 2016 at 02:13:55AM +0100, Stuart Henderson wrote:
> On 2016/09/19 15:39, Jeremie Courreges-Anglas wrote:
> > Stuart Henderson <s...@spacehopper.org> writes:
> >
> > > Hi, I'd strongly prefer a new port for this and keep the existing one as
> > > there are quite a few devices with built-in copies of iperf 2.
> >
> > Seconded.
> >
> > > On 17 September 2016 3:19:45 p.m. Lawrence Teo <l...@openbsd.org> wrote:
> > >
> > >> net/iperf is at 2.0.5 and no longer maintained; its website
> > >> (http://iperf.sourceforge.net) now directs users to iperf3 instead.
> > >>
> > >> A description of iperf3 is available at the top of their main
> > >> non-github site at http://software.es.net/iperf/ -- the summary is that
> > >> iperf3 is a rewritten iperf that is not backwards compatible with iperf.
> > >> The installed binary name has also changed; it is now "bin/iperf3"
> > >> instead of "bin/iperf".
> > >>
> > >> I have attached the new net/iperf3 port for review.
> > >>
> > >> Note: Due to the way iperf3 uses IPV6_V6ONLY
> > >> (https://github.com/esnet/iperf/issues/196),
> >
> > I don't quite understand why adding #ifdefs here helps. It should just
> > be a soft error.
> >
> > >> iperf3 can only listen
> > >> on IPv6 or IPv4 but not both when you start it in server mode. If you
> > >> would like to use it in server mode with IPv4, you will need to run:
> > >>
> > >> iperf3 -4 -s
> >
> > sigh :)
> >
> > >> Some questions:
> > >>
> > >> 1. Is it preferable to introduce a new port or update the existing
> > >>net/iperf port? I lean towards introducing a new port because of the
> > >>backwards incompatibility, and the situation is similar to
> > >>security/p0f and security/p0f3.
> > >>
> > >> 2. If it's preferable to introduce a new port, should the old net/iperf
> > >>port be removed?
> > >>
> > >> Last but not least, thanks to jca@ for prodding me about this. :)
> >
> > ;)
> >
> > >> Thoughts and reviews welcome.
> >
> > No need to set DISTNAME in Makefile, did you want to make it explicit?
This is my first Github-based port and it totally slipped my mind that
DISTNAME does not need to be set. :)
> > The port looks and works fine here, ok jca@. I added a few patches for
> > the visible warnings, the %llu one matters the most I'd say. Updated
> > tarball below.
>
> OK with me.
>
> It might be worth defaulting to v4, but that can happen later.
Thank you for the feedback and ok's. I have imported the port including
jca@'s patches.
Here's an update to default to IPv4 and remove the unnecessary DISTNAME.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/iperf3/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile21 Sep 2016 01:12:57 - 1.1.1.1
+++ Makefile21 Sep 2016 01:51:36 -
@@ -3,8 +3,8 @@
COMMENT= tool to measure maximum achievable bandwidth on IP networks
V= 3.1.3
-DISTNAME= iperf-${V}
PKGNAME= iperf3-${V}
+REVISION= 0
GH_ACCOUNT=esnet
GH_PROJECT=iperf
Index: patches/patch-src_iperf_api_c
===
RCS file: /cvs/ports/net/iperf3/patches/patch-src_iperf_api_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_iperf_api_c
--- patches/patch-src_iperf_api_c 21 Sep 2016 01:12:57 - 1.1.1.1
+++ patches/patch-src_iperf_api_c 21 Sep 2016 01:51:41 -
@@ -1,9 +1,20 @@
$OpenBSD: patch-src_iperf_api_c,v 1.1.1.1 2016/09/21 01:12:57 lteo Exp $
+Default to IPv4.
+
Missing initialization.
src/iperf_api.c.orig Mon Sep 19 14:27:01 2016
-+++ src/iperf_api.cMon Sep 19 14:27:03 2016
+--- src/iperf_api.c.orig Mon Jun 6 14:18:49 2016
src/iperf_api.cSun Sep 18 01:51:24 2016
+@@ -1839,7 +1839,7 @@ iperf_defaults(struct iperf_test *testp)
+ testp->stats_interval = testp->reporter_interval = 1;
+ testp->num_streams = 1;
+
+-testp->settings->domain = AF_UNSPEC;
++testp->settings->domain = AF_INET;
+ testp->settings->unit_format = 'a';
+ testp->settings->socket_bufsize = 0;/* use autotuning */
+ testp->settings->blksize = DEFAULT_TCP_BLKSIZE;
@@ -2323,7 +2323,7 @@ iperf_print_results(struct iperf_test *test)
struct iperf_stream *sp = NULL;
iperf_size_t bytes_sent, total_sent = 0;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/09/20 19:14:35 Modified files: net: Makefile Log message: +iperf3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/09/20 19:12:57 Log message: Import net/iperf3, a rewritten version of iperf. iperf is a tool for active measurements of the maximum achievable bandwidth on IP networks. It supports tuning of various parameters related to timing, protocols, and buffers. For each test it reports the bandwidth, loss, and other parameters. This version, sometimes referred to as iperf3, is a redesign of an original version developed at NLANR / DAST. iperf3 is a new implementation from scratch, with the goal of a smaller, simpler code base, and a library version of the functionality that can be used in other programs. iperf3 also incorporates a number of features found in other tools such as nuttcp and netperf, but were missing from the original iperf. Note that iperf3 is not backwards compatible with the original iperf. prodding & patches from jca@, thanks! feedback & ok jca@ sthen@ Status: Vendor Tag: lteo Release Tags: lteo_20160918 N ports/net/iperf3/Makefile N ports/net/iperf3/distinfo N ports/net/iperf3/pkg/DESCR N ports/net/iperf3/pkg/PLIST N ports/net/iperf3/patches/patch-src_iperf_udp_c N ports/net/iperf3/patches/patch-src_portable_endian_h N ports/net/iperf3/patches/patch-src_iperf_api_c No conflicts created by this import
NEW: net/iperf3
net/iperf is at 2.0.5 and no longer maintained; its website (http://iperf.sourceforge.net) now directs users to iperf3 instead. A description of iperf3 is available at the top of their main non-github site at http://software.es.net/iperf/ -- the summary is that iperf3 is a rewritten iperf that is not backwards compatible with iperf. The installed binary name has also changed; it is now "bin/iperf3" instead of "bin/iperf". I have attached the new net/iperf3 port for review. Note: Due to the way iperf3 uses IPV6_V6ONLY (https://github.com/esnet/iperf/issues/196), iperf3 can only listen on IPv6 or IPv4 but not both when you start it in server mode. If you would like to use it in server mode with IPv4, you will need to run: iperf3 -4 -s Some questions: 1. Is it preferable to introduce a new port or update the existing net/iperf port? I lean towards introducing a new port because of the backwards incompatibility, and the situation is similar to security/p0f and security/p0f3. 2. If it's preferable to introduce a new port, should the old net/iperf port be removed? Last but not least, thanks to jca@ for prodding me about this. :) Thoughts and reviews welcome. Lawrence iperf3-3.1.3.tar.gz Description: application/tar-gz
Re: [UPDATE] net/weechat to 1.5.0
On Wed, May 04, 2016 at 04:37:41PM -0600, Aaron Bieber wrote: > > > On Sun, May 1, 2016, at 12:28 PM, Eric Lalonde wrote: > > Hello ports, > > > > net/weechat has been updated to 1.5.0. Changes include Portuguese > > support, detection of ruby 2.3, and 16 bugfixes. Full changelog is > > available at: https://weechat.org/files/changelog/ChangeLog-1.5.html > > > > Tested with recent snapshots on i386 and amd64 arches. > > Working well here! OK abieber@. Can we get another OK? :D Works fine here too. ok lteo@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: l...@cvs.openbsd.org2016/05/01 20:29:58
Modified files:
net/snort : Makefile distinfo
net/snort/patches: patch-etc_snort_conf patch-src_decode_h
patch-src_dynamic-plugins_sf_engine_Makefile_in
patch-src_dynamic-preprocessors_Makefile_in
patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
patch-src_dynamic-preprocessors_dnp3_Makefile_in
patch-src_dynamic-preprocessors_dns_Makefile_in
patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
patch-src_dynamic-preprocessors_gtp_Makefile_in
patch-src_dynamic-preprocessors_imap_Makefile_in
patch-src_dynamic-preprocessors_modbus_Makefile_in
patch-src_dynamic-preprocessors_pop_Makefile_in
patch-src_dynamic-preprocessors_reputation_Makefile_in
patch-src_dynamic-preprocessors_sdf_Makefile_in
patch-src_dynamic-preprocessors_sip_Makefile_in
patch-src_dynamic-preprocessors_smtp_Makefile_in
patch-src_dynamic-preprocessors_ssh_Makefile_in
patch-src_dynamic-preprocessors_ssl_Makefile_in
patch-src_preprocessors_Stream6_snort_stream_tcp_c
net/snort/pkg : PLIST README snort.rc
Log message:
Update to Snort 2.9.8.2.
Other minor changes:
- Shortened a line in pkg/README so that portcheck won't complain.
- Replaced "/var" with ${LOCALSTATEDIR} in pkg/snort.rc.
- Regenerated patches.
Tested on amd64 by myself and on i386 by Markus Lude.
Tests were done with DAQ 2.0.6.
ok Markus Lude (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/05/01 20:28:47 Modified files: net/daq: Makefile distinfo net/daq/patches: patch-api_daq_common_h patch-os-daq-modules_daq_ipfw_c Log message: Update to DAQ 2.0.6. ok maintainer Markus Lude (who had the same diff)
UPDATE: net/snort 2.9.8.2
This updates Snort to 2.9.8.2.
Tested with DAQ 2.0.6 (sent earlier) on amd64.
Other minor changes in the port:
- Shortened a line in the pkg/README so that portcheck won't complain.
- Replaced "/var" with ${LOCALSTATEDIR} in pkg/snort.rc.
- Regenerated patches.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile16 Mar 2016 21:19:39 - 1.93
+++ Makefile30 Apr 2016 00:35:50 -
@@ -2,7 +2,7 @@
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.7.3
+VERSION = 2.9.8.2
DISTNAME = snort-${VERSION}
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo29 May 2015 03:28:18 - 1.33
+++ distinfo30 Apr 2016 00:35:50 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.7.3.tar.gz) = jMNhO4iPxUlHor7sdzx22aIDaPJlmzHUWp8LEeZswik=
-SIZE (snort-2.9.7.3.tar.gz) = 6300073
+SHA256 (snort-2.9.8.2.tar.gz) = QHUBLTUN+kegIAt6kgMj8Vy3w3B5DypHNnwDq6QAkzM=
+SIZE (snort-2.9.8.2.tar.gz) = 6311793
Index: patches/patch-etc_snort_conf
===
RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
retrieving revision 1.14
diff -u -p -r1.14 patch-etc_snort_conf
--- patches/patch-etc_snort_conf29 May 2015 03:28:18 - 1.14
+++ patches/patch-etc_snort_conf30 Apr 2016 00:35:50 -
@@ -2,8 +2,8 @@ $OpenBSD: patch-etc_snort_conf,v 1.14 20
reputation preprocessor disabled, still experimental
etc/snort.conf.origThu Apr 23 20:29:00 2015
-+++ etc/snort.conf Sun May 24 22:10:12 2015
+--- etc/snort.conf.origFri Mar 18 15:11:55 2016
etc/snort.conf Fri Apr 29 11:02:26 2016
@@ -101,17 +101,17 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1
# Path to your rules files (this can be a relative path)
# Note for Windows users: You are advised to make this an absolute path,
@@ -48,7 +48,7 @@ reputation preprocessor disabled, still
# config daq_mode:
# config daq_var:
#
-@@ -503,12 +508,12 @@ preprocessor dnp3: ports { 2 } \
+@@ -504,12 +509,12 @@ preprocessor dnp3: ports { 2 } \
check_crc
# Reputation preprocessor. For more information see README.reputation
@@ -67,7 +67,7 @@ reputation preprocessor disabled, still
###
# Step #6: Configure output plugins
-@@ -542,8 +547,10 @@ include reference.config
+@@ -543,8 +548,10 @@ include reference.config
###
# site specific rules
@@ -79,7 +79,7 @@ reputation preprocessor disabled, still
include $RULE_PATH/app-detect.rules
include $RULE_PATH/attack-responses.rules
include $RULE_PATH/backdoor.rules
-@@ -568,6 +575,7 @@ include $RULE_PATH/file-executable.rules
+@@ -569,6 +576,7 @@ include $RULE_PATH/file-executable.rules
include $RULE_PATH/file-flash.rules
include $RULE_PATH/file-identify.rules
include $RULE_PATH/file-image.rules
@@ -87,7 +87,7 @@ reputation preprocessor disabled, still
include $RULE_PATH/file-multimedia.rules
include $RULE_PATH/file-office.rules
include $RULE_PATH/file-other.rules
-@@ -579,6 +587,7 @@ include $RULE_PATH/icmp.rules
+@@ -580,6 +588,7 @@ include $RULE_PATH/icmp.rules
include $RULE_PATH/imap.rules
include $RULE_PATH/indicator-compromise.rules
include $RULE_PATH/indicator-obfuscation.rules
@@ -95,7 +95,7 @@ reputation preprocessor disabled, still
include $RULE_PATH/indicator-shellcode.rules
include $RULE_PATH/info.rules
include $RULE_PATH/malware-backdoor.rules
-@@ -592,6 +601,7 @@ include $RULE_PATH/netbios.rules
+@@ -593,6 +602,7 @@ include $RULE_PATH/netbios.rules
include $RULE_PATH/nntp.rules
include $RULE_PATH/oracle.rules
include $RULE_PATH/os-linux.rules
@@ -103,7 +103,7 @@ reputation preprocessor disabled, still
include $RULE_PATH/os-other.rules
include $RULE_PATH/os-solaris.rules
include $RULE_PATH/os-windows.rules
-@@ -605,12 +615,20 @@ include $RULE_PATH/policy-social.rules
+@@ -606,12 +616,20 @@ include $RULE_PATH/policy-social.rules
include $RULE_PATH/policy-spam.rules
include $RULE_PATH/pop2.rules
include $RULE_PATH/pop3.rules
@@ -124,7 +124,7 @@ reputation preprocessor disabled, still
include $RULE_PATH/protocol-voip.rules
include $RULE_PATH/pua-adware.rules
include $RULE_PATH/pua-other.rules
-@@ -627,6 +645,7 @@ include $RULE_PATH/server-mssql.rules
+@@ -628,6 +646,7 @@ include $RULE_PATH/server-mssql.rules
include $RULE_PATH/server-mysql.rules
include $RULE_PATH/server-oracle.rules
include $RULE_PATH/server-other.rules
@@ -132,7 +132,7 @@ reputation preprocessor disabled, still
include $RULE_PATH/server-webapp.rules
include
UPDATE: net/daq 2.0.6
This updates DAQ to 2.0.6. Tested on amd64 with an upcoming Snort 2.9.8.2 port
which I will mail shortly.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile4 Apr 2016 16:09:09 - 1.14
+++ Makefile30 Apr 2016 00:34:03 -
@@ -2,8 +2,7 @@
COMMENT = data acquisition library for snort
-DISTNAME = daq-2.0.5
-REVISION = 0
+DISTNAME = daq-2.0.6
SHARED_LIBS += daq 2.1 # 2.4
SHARED_LIBS += sfbpf 1.0 # 0.1
Index: distinfo
===
RCS file: /cvs/ports/net/daq/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo29 May 2015 03:27:27 - 1.6
+++ distinfo30 Apr 2016 00:34:03 -
@@ -1,2 +1,2 @@
-SHA256 (daq-2.0.5.tar.gz) = dwS124WHMhQlhvUEPesHM+LDllNcgwgekY+2mTJYvG0=
-SIZE (daq-2.0.5.tar.gz) = 517801
+SHA256 (daq-2.0.6.tar.gz) = tA4dEnPgiq6qhuadTyjVNbflO9s4mK31OSZrYxN758s=
+SIZE (daq-2.0.6.tar.gz) = 514687
Index: patches/patch-api_daq_common_h
===
RCS file: /cvs/ports/net/daq/patches/patch-api_daq_common_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-api_daq_common_h
--- patches/patch-api_daq_common_h 29 May 2015 03:27:27 - 1.4
+++ patches/patch-api_daq_common_h 30 Apr 2016 00:34:03 -
@@ -1,9 +1,9 @@
$OpenBSD: patch-api_daq_common_h,v 1.4 2015/05/29 03:27:27 lteo Exp $
api/daq_common.h.orig Thu Apr 23 02:15:57 2015
-+++ api/daq_common.h Sun May 24 16:51:38 2015
-@@ -27,6 +27,10 @@
- #ifndef WIN32
+--- api/daq_common.h.orig Tue Sep 9 15:57:29 2014
api/daq_common.h Fri Apr 29 10:54:35 2016
+@@ -26,6 +26,10 @@
#include
+ #ifndef WIN32
#include
+#if defined(__OpenBSD__)
+/* for struct bpf_timeval */
@@ -12,7 +12,7 @@ $OpenBSD: patch-api_daq_common_h,v 1.4 2
#else
/* for struct timeavl */
#include
-@@ -100,7 +104,11 @@
+@@ -98,7 +102,11 @@
#define DAQ_PKTHDR_FLOOD-2 /* Egress is flooding */
typedef struct _daq_pkthdr
{
Index: patches/patch-os-daq-modules_daq_ipfw_c
===
RCS file: /cvs/ports/net/daq/patches/patch-os-daq-modules_daq_ipfw_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-os-daq-modules_daq_ipfw_c
--- patches/patch-os-daq-modules_daq_ipfw_c 29 May 2015 03:27:27 -
1.4
+++ patches/patch-os-daq-modules_daq_ipfw_c 30 Apr 2016 00:34:03 -
@@ -4,9 +4,9 @@ This patch removes DAQ_CAPA_UNPRIV_START
Snort can run as an unprivileged user in inline mode. Sent upstream:
http://marc.info/?l=snort-devel=136254358118711=2
os-daq-modules/daq_ipfw.c.orig Thu Apr 23 02:15:57 2015
-+++ os-daq-modules/daq_ipfw.c Sun May 24 16:51:39 2015
-@@ -404,7 +404,7 @@ static int ipfw_daq_get_snaplen (void* handle)
+--- os-daq-modules/daq_ipfw.c.orig Tue Sep 9 15:57:31 2014
os-daq-modules/daq_ipfw.c Fri Apr 29 10:54:35 2016
+@@ -403,7 +403,7 @@ static int ipfw_daq_get_snaplen (void* handle)
static uint32_t ipfw_daq_get_capabilities (void* handle)
{
return DAQ_CAPA_BLOCK | DAQ_CAPA_REPLACE | DAQ_CAPA_INJECT |
DAQ_CAPA_INJECT_RAW
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/04/06 20:32:02 Modified files: devel/kdiff3 : Makefile Log message: Drop maintainership; I no longer use kdiff3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/03/24 19:15:43 Modified files: security : Makefile Log message: +ssdeep
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2016/03/24 19:11:40 Log message: import security/ssdeep ssdeep is a fuzzy hashing program and library that is useful for finding almost identical files. From pkg/DESCR: "ssdeep is a program for computing context triggered piecewise hashes (CTPH). Also called fuzzy hashes, CTPH can match inputs that have homologies. Such inputs have sequences of identical bytes in the same order, although bytes in between these sequences may be different in both content and length. The package also includes a fuzzy hashing API, which is documented in the README file." ok mmcc@ zhuk@ Status: Vendor Tag: lteo Release Tags: lteo_20160324 N ports/security/ssdeep/Makefile N ports/security/ssdeep/distinfo N ports/security/ssdeep/pkg/PLIST N ports/security/ssdeep/pkg/DESCR No conflicts created by this import
Re: NEW: security/ssdeep
On Wed, Mar 23, 2016 at 08:42:09PM -0400, Lawrence Teo wrote: > ssdeep is a fuzzy hashing program and library that is useful for finding > almost identical files. > > From pkg/DESCR: > "ssdeep is a program for computing context triggered piecewise hashes (CTPH). > Also called fuzzy hashes, CTPH can match inputs that have homologies. Such > inputs have sequences of identical bytes in the same order, although bytes > in between these sequences may be different in both content and length. > > The package also includes a fuzzy hashing API, which is documented in the > README file." > > > Sample usage: > > $ ssdeep /bsd > ssdeep,1.1--blocksize:hash:hash,filename > 196608:0FEGkK3+KgZ50tiuWUcvExbAcLYZ3lbAn7YZqWE/j0yky8Q3oM3ocm7GAWJ:ZyUuUA7YEp,"/bsd" > > This URL shows more usage examples: > > http://ssdeep.sourceforge.net/usage.html#basic > > ok? Let's try that again, with an attachment this time. :) ssdeep.tar.gz Description: application/tar-gz
NEW: security/ssdeep
ssdeep is a fuzzy hashing program and library that is useful for finding almost identical files. >From pkg/DESCR: "ssdeep is a program for computing context triggered piecewise hashes (CTPH). Also called fuzzy hashes, CTPH can match inputs that have homologies. Such inputs have sequences of identical bytes in the same order, although bytes in between these sequences may be different in both content and length. The package also includes a fuzzy hashing API, which is documented in the README file." Sample usage: $ ssdeep /bsd ssdeep,1.1--blocksize:hash:hash,filename 196608:0FEGkK3+KgZ50tiuWUcvExbAcLYZ3lbAn7YZqWE/j0yky8Q3oM3ocm7GAWJ:ZyUuUA7YEp,"/bsd" This URL shows more usage examples: http://ssdeep.sourceforge.net/usage.html#basic ok?
