Date: Sat, 18 Apr 2026 22:01:03 +0000 From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9564cf81b8f6 - main - devel/libinjection: Update to 4.0.0 Message-ID: <69e3ff1f.33ab2.2aa41b1f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9564cf81b8f6ff45cce2322c5b76147c6ca6bed8 commit 9564cf81b8f6ff45cce2322c5b76147c6ca6bed8 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2026-04-18 21:22:13 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2026-04-18 21:22:13 +0000 devel/libinjection: Update to 4.0.0 - Bump PORTREVISION of dependent ports for shlib change Changes: https://github.com/libinjection/libinjection/releases --- devel/libddwaf/Makefile | 1 + devel/libinjection/Makefile | 20 ++--- devel/libinjection/distinfo | 6 +- devel/libinjection/files/patch-2to3 | 99 ---------------------- devel/libinjection/files/patch-Makefile | 11 --- devel/libinjection/files/patch-libinjection_sqli.c | 11 --- devel/libinjection/pkg-plist | 4 +- 7 files changed, 12 insertions(+), 140 deletions(-) diff --git a/devel/libddwaf/Makefile b/devel/libddwaf/Makefile index 0664a3a8ca01..7dcaadfe837a 100644 --- a/devel/libddwaf/Makefile +++ b/devel/libddwaf/Makefile @@ -1,5 +1,6 @@ PORTNAME= libddwaf PORTVERSION= 1.30.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org diff --git a/devel/libinjection/Makefile b/devel/libinjection/Makefile index 9650caa588f5..4a7a74e4b08f 100644 --- a/devel/libinjection/Makefile +++ b/devel/libinjection/Makefile @@ -1,7 +1,6 @@ PORTNAME= libinjection -PORTVERSION= 3.10.0 +PORTVERSION= 4.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org @@ -9,12 +8,13 @@ COMMENT= SQL / SQLI tokenizer parser analyzer WWW= https://github.com/libinjection/libinjection LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/../COPYING +LICENSE_FILE= ${WRKSRC}/COPYING -USES= python:build shebangfix +USES= autoreconf libtool python:build shebangfix +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip USE_LDCONFIG= yes -WRKSRC_SUBDIR= src PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -22,14 +22,4 @@ USE_GITHUB= yes SHEBANG_GLOB= *.py -post-patch: - @${REINPLACE_CMD} -e 's|%%SHLIB_VER%%|${PORTVERSION:R:R}|' ${WRKSRC}/Makefile - -do-install: - ${INSTALL_DATA} ${WRKSRC}/libinjection*.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_DATA} ${WRKSRC}/libinjection.a ${STAGEDIR}${PREFIX}/lib/libinjection.a - ${INSTALL_LIB} ${WRKSRC}/libinjection.so ${STAGEDIR}${PREFIX}/lib/libinjection.so.${PORTVERSION} - ${LN} -s libinjection.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libinjection.so - ${LN} -s libinjection.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libinjection.so.${PORTVERSION:R:R} - .include <bsd.port.mk> diff --git a/devel/libinjection/distinfo b/devel/libinjection/distinfo index d0fd664dae30..f259d0506a27 100644 --- a/devel/libinjection/distinfo +++ b/devel/libinjection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646057842 -SHA256 (libinjection-libinjection-v3.10.0_GH0.tar.gz) = 9dd7ae68a21a3c50f705c383b1b714c77fd4093b0a561a5400f0cb0ad79b1ae7 -SIZE (libinjection-libinjection-v3.10.0_GH0.tar.gz) = 1658759 +TIMESTAMP = 1775587120 +SHA256 (libinjection-libinjection-v4.0.0_GH0.tar.gz) = a69d27e3d98608df89203c4e1c00c034fe0f8c723017e4088ab53ce3ff5a9129 +SIZE (libinjection-libinjection-v4.0.0_GH0.tar.gz) = 2237310 diff --git a/devel/libinjection/files/patch-2to3 b/devel/libinjection/files/patch-2to3 deleted file mode 100644 index cb6dad219a49..000000000000 --- a/devel/libinjection/files/patch-2to3 +++ /dev/null @@ -1,99 +0,0 @@ ---- make_parens.py.orig 2022-03-04 21:37:55 UTC -+++ make_parens.py -@@ -412,7 +412,7 @@ def main(): - mutator.permute(line.strip()) - - for fingerprint in mutator.aslist(): -- print fingerprint -+ print(fingerprint) - - - if __name__ == '__main__': ---- sqlparse_map.py.orig 2022-03-04 21:37:55 UTC -+++ sqlparse_map.py -@@ -1564,6 +1564,6 @@ if __name__ == '__main__': - if len(CHARMAP) != 256: - sys.stderr.write("Assert failed: charmap is %d characters\n" % len(CHARMAP)) - sys.exit(1) -- print dump() -+ print(dump()) - - # pylint: disable=C0301,C0302 ---- sqlparse2c.py.orig 2022-03-04 21:38:43 UTC -+++ sqlparse2c.py -@@ -14,7 +14,7 @@ import sys - def toc(obj): - """ main routine """ - -- print """ -+ print(""" - #ifndef LIBINJECTION_SQLI_DATA_H - #define LIBINJECTION_SQLI_DATA_H - -@@ -48,7 +48,7 @@ static size_t parse_xstring(sfilter * sf); - static size_t parse_bstring(sfilter * sf); - static size_t parse_estring(sfilter * sf); - static size_t parse_bword(sfilter * sf); --""" -+""") - - # - # Mapping of character to function -@@ -85,26 +85,26 @@ static size_t parse_bword(sfilter * sf); - 'CHAR_ESTRING' : 'parse_estring', - 'CHAR_BWORD' : 'parse_bword' - } -- print -- print "typedef size_t (*pt2Function)(sfilter *sf);" -- print "static const pt2Function char_parse_map[] = {" -+ print() -+ print("typedef size_t (*pt2Function)(sfilter *sf);") -+ print("static const pt2Function char_parse_map[] = {") - pos = 0 - for character in obj['charmap']: -- print " &%s, /* %d */" % (fnmap[character], pos) -+ print(" &%s, /* %d */" % (fnmap[character], pos)) - pos += 1 -- print "};" -- print -+ print("};") -+ print() - - # keywords - # load them - keywords = obj['keywords'] - -- for fingerprint in list(obj[u'fingerprints']): -+ for fingerprint in list(obj['fingerprints']): - fingerprint = '0' + fingerprint.upper() - keywords[fingerprint] = 'F' - - needhelp = [] -- for key in keywords.iterkeys(): -+ for key in keywords.keys(): - if key != key.upper(): - needhelp.append(key) - -@@ -113,17 +113,17 @@ static size_t parse_bword(sfilter * sf); - del keywords[key] - keywords[key.upper()] = tmpv - -- print "static const keyword_t sql_keywords[] = {" -+ print("static const keyword_t sql_keywords[] = {") - for k in sorted(keywords.keys()): - if len(k) > 31: - sys.stderr.write("ERROR: keyword greater than 32 chars\n") - sys.exit(1) - -- print " {\"%s\", '%s'}," % (k, keywords[k]) -- print "};" -- print "static const size_t sql_keywords_sz = %d;" % (len(keywords), ) -+ print(" {\"%s\", '%s'}," % (k, keywords[k])) -+ print("};") -+ print("static const size_t sql_keywords_sz = %d;" % (len(keywords), )) - -- print "#endif" -+ print("#endif") - return 0 - - if __name__ == '__main__': diff --git a/devel/libinjection/files/patch-Makefile b/devel/libinjection/files/patch-Makefile deleted file mode 100644 index d25604d3fd81..000000000000 --- a/devel/libinjection/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2017-05-21 20:44:26 UTC -+++ Makefile -@@ -63,7 +63,7 @@ libinjection_html5.o: libinjection.h libinjection_html - ${CC} ${CFLAGS} -c -o libinjection_html5.o libinjection_html5.c - - ${SHAREDLIB}: ${OBJECTS} -- $(CC) $+ -shared -lc -o $@ -+ $(CC) ${OBJECTS} -shared -Wl,-soname,libinjection.so.%%SHLIB_VER%% -lc -o $@ - - ${STATICLIB}: ${OBJECTS} - rm -f ${STATICLIB} diff --git a/devel/libinjection/files/patch-libinjection_sqli.c b/devel/libinjection/files/patch-libinjection_sqli.c deleted file mode 100644 index a3fde4725949..000000000000 --- a/devel/libinjection/files/patch-libinjection_sqli.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libinjection_sqli.c.orig 2017-05-21 20:44:26 UTC -+++ libinjection_sqli.c -@@ -1197,7 +1197,7 @@ static size_t parse_number(struct libinjection_sqli_st - * without having to regenerated the SWIG (or other binding) in minor - * releases. - */ --const char* libinjection_version() -+const char* libinjection_version(void) - { - return LIBINJECTION_VERSION; - } diff --git a/devel/libinjection/pkg-plist b/devel/libinjection/pkg-plist index 357df38a3adb..3c854cd223c0 100644 --- a/devel/libinjection/pkg-plist +++ b/devel/libinjection/pkg-plist @@ -1,9 +1,11 @@ include/libinjection.h +include/libinjection_error.h include/libinjection_html5.h include/libinjection_sqli.h include/libinjection_sqli_data.h include/libinjection_xss.h lib/libinjection.a lib/libinjection.so -lib/libinjection.so.3 +lib/libinjection.so.4 lib/libinjection.so.%%PORTVERSION%% +libdata/pkgconfig/libinjection.pchome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e3ff1f.33ab2.2aa41b1f>