This commit is contained in:
2025-08-19 13:02:56 +02:00
parent c0298edae2
commit b19b6ec55b
16 changed files with 440 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
--- ./Makefile.orig 2023-07-14 15:06:29.000000000 +0200
+++ ./Makefile 2025-08-19 12:49:39.485030000 +0200
@@ -78,7 +78,7 @@
install-conf:
$(INSTALL) -d $(SYSCONFDIR)
- tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp $(SYSCONFDIR)/rhashrc
+ tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp $(SYSCONFDIR)/rhashrc.sample
rm -f rc.tmp
# dependencies should be properly set, otherwise 'make -j<n>' can fail

View File

@@ -0,0 +1,31 @@
--- ./configure.orig 2023-07-14 15:06:29.000000000 +0200
+++ ./configure 2025-08-19 12:51:20.460141000 +0200
@@ -567,6 +567,7 @@
sunos() { test "$OS_LC" = "sunos"; }
wine() { test "$OS_LC" = "wine"; }
win32() { cygwin || mingw32 || mingw64 || msys || wine; }
+bsd() { dragonfly || freebsd || netbsd || openbsd ; }
posix_make() { aix || bsdos || hpux || irix || qnx || sunos; }
#####################################################################
@@ -713,9 +714,9 @@
elif darwin; then
SHARED_EXT=".${RHASH_VERSION_MAJOR}.dylib"
SOLINK_EXT=".dylib"
-elif linux; then
+elif linux || bsd; then
# use the full library version for the library file extension
- SHARED_EXT=".so.${RHASH_VERSION}"
+ SHARED_EXT=".so.${RHASH_VERSION_MAJOR}"
fi
#####################################################################
@@ -876,7 +877,7 @@
RHASH_TEST_OPTIONS=--shared
test "$INSTALL_LIB_SHARED" = "auto" && INSTALL_LIB_SHARED=yes
test "$INSTALL_LIB_STATIC" = "yes" && RHASH_BUILD_TARGETS="$RHASH_BUILD_TARGETS \$(LIBRHASH_STATIC)"
- RHASH_LDFLAGS=$RHASH_LDFLAGS $GETTEXT_LDFLAGS
+ RHASH_LDFLAGS=$(join_params $RHASH_LDFLAGS $GETTEXT_LDFLAGS)
else
LIBRHASH_TYPE=static
LIBRHASH_PATH="\$(LIBRHASH_STATIC)"

View File

@@ -0,0 +1,26 @@
--- ./librhash/Makefile.orig 2023-07-14 15:06:29.000000000 +0200
+++ ./librhash/Makefile 2025-08-19 12:49:39.485693000 +0200
@@ -27,9 +27,9 @@
install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED)
$(INSTALL) -d $(SO_DIR)
$(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/
- test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
+ test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \
rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \
- ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ)
+ ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) )
install-implib:
$(INSTALL) -d $(LIBDIR)
@@ -175,9 +175,9 @@
$(LIB_HEADERS) | grep -v "$(EXPORTS_SKIP)" > $@
$(LIBRHASH_SOLINK):
- test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
+ test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \
rm -f $(LIBRHASH_SO_MAJ) && \
- ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ)
+ ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ) )
rm -f $(LIBRHASH_SOLINK)
ln -s $(LIBRHASH_SO_MAJ) $(LIBRHASH_SOLINK)

View File

@@ -0,0 +1,11 @@
--- packaging/ldns-config.in.orig 2021-11-16 13:49:37 UTC
+++ packaging/ldns-config.in
@@ -4,7 +4,7 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
VERSION="@PACKAGE_VERSION@"
CFLAGS="@CFLAGS@"
-CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@"
+CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@"
LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@"
PYTHON_CPPFLAGS="@PYTHON_CPPFLAGS@"
PYTHON_LDFLAGS="@PYTHON_LDFLAGS@"

View File

@@ -0,0 +1,77 @@
--- contrib/python/ldns_buffer.i.orig 2024-07-20 05:07:42 UTC
+++ contrib/python/ldns_buffer.i
@@ -45,7 +45,7 @@
/* Result generation, appends (ldns_buffer *) after the result. */
%typemap(argout, noblock=1) (ldns_buffer **)
{
- $result = SWIG_Python_AppendOutput($result,
+ $result = SWIG_AppendOutput($result,
SWIG_NewPointerObj(SWIG_as_voidptr($1_buf),
SWIGTYPE_p_ldns_struct_buffer, SWIG_POINTER_OWN | 0));
}
--- contrib/python/ldns_key.i.orig 2024-07-20 05:07:42 UTC
+++ contrib/python/ldns_key.i
@@ -38,7 +38,7 @@
/* result generation */
%typemap(argout,noblock=1) (ldns_key **)
{
- $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_key), SWIGTYPE_p_ldns_struct_key, SWIG_POINTER_OWN | 0 ));
+ $result = SWIG_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_key), SWIGTYPE_p_ldns_struct_key, SWIG_POINTER_OWN | 0 ));
}
%typemap(argout) ldns_rdf *r "Py_INCREF($input);"
--- contrib/python/ldns_packet.i.orig 2024-07-20 05:07:42 UTC
+++ contrib/python/ldns_packet.i
@@ -45,7 +45,7 @@
/* Result generation, appends (ldns_pkt *) after the result. */
%typemap(argout,noblock=1) (ldns_pkt **)
{
- $result = SWIG_Python_AppendOutput($result,
+ $result = SWIG_AppendOutput($result,
SWIG_NewPointerObj(SWIG_as_voidptr($1_pkt),
SWIGTYPE_p_ldns_struct_pkt, SWIG_POINTER_OWN | 0 ));
}
--- contrib/python/ldns_rdf.i.orig 2024-07-20 05:07:42 UTC
+++ contrib/python/ldns_rdf.i
@@ -45,7 +45,7 @@
/* Result generation, appends (ldns_rdf *) after the result. */
%typemap(argout, noblock=1) (ldns_rdf **)
{
- $result = SWIG_Python_AppendOutput($result,
+ $result = SWIG_AppendOutput($result,
SWIG_NewPointerObj(SWIG_as_voidptr($1_rdf),
SWIGTYPE_p_ldns_struct_rdf, SWIG_POINTER_OWN | 0));
}
--- contrib/python/ldns_resolver.i.orig 2024-07-20 05:07:42 UTC
+++ contrib/python/ldns_resolver.i
@@ -45,7 +45,7 @@
/* Result generation, appends (ldns_resolver *) after the result. */
%typemap(argout,noblock=1) (ldns_resolver **r)
{
- $result = SWIG_Python_AppendOutput($result,
+ $result = SWIG_AppendOutput($result,
SWIG_NewPointerObj(SWIG_as_voidptr($1_res),
SWIGTYPE_p_ldns_struct_resolver, SWIG_POINTER_OWN | 0 ));
}
--- contrib/python/ldns_rr.i.orig 2024-07-20 05:07:42 UTC
+++ contrib/python/ldns_rr.i
@@ -45,7 +45,7 @@
/* Result generation, appends (ldns_rr *) after the result. */
%typemap(argout, noblock=1) (ldns_rr **)
{
- $result = SWIG_Python_AppendOutput($result,
+ $result = SWIG_AppendOutput($result,
SWIG_NewPointerObj(SWIG_as_voidptr($1_rr),
SWIGTYPE_p_ldns_struct_rr, SWIG_POINTER_OWN | 0 ));
}
--- contrib/python/ldns_zone.i.orig 2024-07-20 05:07:42 UTC
+++ contrib/python/ldns_zone.i
@@ -39,7 +39,7 @@
/* result generation */
%typemap(argout,noblock=1) (ldns_zone **)
{
- $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_zone), SWIGTYPE_p_ldns_struct_zone, SWIG_POINTER_OWN | 0 ));
+ $result = SWIG_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_zone), SWIGTYPE_p_ldns_struct_zone, SWIG_POINTER_OWN | 0 ));
}
%nodefaultctor ldns_struct_zone; //no default constructor & destructor

35
system/pkg2/Makefile Normal file
View File

@@ -0,0 +1,35 @@
# $FreeBSD: head/ports-mgmt/pkg/Makefile 562140 2021-01-20 14:35:40Z manu $
PORTNAME= pkg
DISTVERSION= 2.2.2
_PKG_VERSION= ${DISTVERSION}
CATEGORIES= ports-mgmt
MAINTAINER= pkg@FreeBSD.org
COMMENT= Package manager
USE_GITHUB= yes
GH_ACCOUNT= freebsd
USE_LDCONFIG= ${PREFIX}/lib/compat/pkg
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --mandir=${PREFIX}/man --prefix="${PREFIX}"
CONFIGURE_ENV= CC_FOR_BUILD="${CC}"
# Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
# so that pkg-static is used from the wrkdir
USE_SUBMAKE= yes
CFLAGS+= -Wno-error
PKG_DEPENDS= #
#LIBLZMA_LIBS= -llzma
post-patch:
# ${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \
# ${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup
## ${REINPLACE_CMD} -e 's,libdata/pkgconfig,lib/pkgconfig,' ${WRKSRC}/auto.def
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
.include <bsd.port.mk>

3
system/pkg2/distinfo Normal file
View File

@@ -0,0 +1,3 @@
TIMESTAMP = 1755579112
SHA256 (freebsd-pkg-2.2.2_GH0.tar.gz) = 0b4adfc795f5052b1592dee409d39cbaad7f6dc8b6c4d7af4263e1cff6b1bee9
SIZE (freebsd-pkg-2.2.2_GH0.tar.gz) = 16516809

View File

@@ -0,0 +1,34 @@
--- docs/pkg.8.orig 2015-04-14 18:00:21 UTC
+++ docs/pkg.8
@@ -29,7 +29,7 @@
.Op Fl d
.Op Fl l
.Op Fl N
-.Op Fl j Ao jail name or id Ac | Fl c Ao chroot path Ac | Fl r Ao root directory Ac
+.Op Fl j Ao chroot path Ac | Fl r Ao root directory Ac
.Op Fl C Ao configuration file Ac
.Op Fl R Ao repository configuration directory Ac
.Op Fl 4 | Fl 6
@@ -144,22 +144,6 @@ is installed and activated:
# pkg_install-specifics
fi
.Ed
-.It Fl j Ao jail name or id Ac , Cm --jail Ao jail name or id Ac
-.Nm
-will execute in the given
-.Ao jail name or id Ac ,
-where
-.Em name
-matches
-.Dq Cm jls Ar name
-and
-.Em id
-matches
-.Dq Cm jls Ar jid .
-See
-.Xr jail 8
-and
-.Xr jls 8 .
.It Fl c Ao chroot path Ac , Cm --chroot Ao chroot path Ac
.Nm
will chroot in the

View File

@@ -0,0 +1,11 @@
--- src/Makefile.autosetup.orig 2022-12-11 18:22:41 UTC
+++ src/Makefile.autosetup
@@ -93,7 +93,7 @@ pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat
install: install-static
pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat.a
- $(CC) -o $@ $(OBJS) $(STATIC_ARG) $(LDFLAGS) $(STATIC_LDFLAGS)
+ $(CC) -o $@ $(OBJS) $(STATIC_ARG) $(STATIC_LDFLAGS)
install-static: pkg-static
install -d -m 755 $(DESTDIR)$(sbindir)

3
system/pkg2/pkg-descr Normal file
View File

@@ -0,0 +1,3 @@
Package management tool
WWW: https://github.com/freebsd/pkg

62
system/pkg2/pkg-plist Normal file
View File

@@ -0,0 +1,62 @@
etc/periodic/daily/411.pkg-backup
etc/periodic/daily/490.status-pkg-changes
etc/periodic/security/405.pkg-base-audit
etc/periodic/security/410.pkg-audit
etc/periodic/security/460.pkg-checksum
etc/periodic/weekly/400.status-pkg
include/pkg.h
include/pkg/audit.h
include/pkg/vec.h
lib/libpkg.a
lib/libpkg.so
lib/libpkg.so.4
libdata/pkgconfig/pkg.pc
man/man3/pkg_create.3.gz
man/man3/pkg_printf.3.gz
man/man3/pkg_repo_create.3.gz
man/man3/pkg_repos.3.gz
man/man5/pkg-keywords.5.gz
man/man5/pkg-lua-script.5.gz
man/man5/pkg-repository.5.gz
man/man5/pkg-script.5.gz
man/man5/pkg-triggers.5.gz
man/man5/pkg.conf.5.gz
man/man8/pkg-add.8.gz
man/man8/pkg-alias.8.gz
man/man8/pkg-annotate.8.gz
man/man8/pkg-audit.8.gz
man/man8/pkg-autoremove.8.gz
man/man8/pkg-check.8.gz
man/man8/pkg-clean.8.gz
man/man8/pkg-config.8.gz
man/man8/pkg-create.8.gz
man/man8/pkg-delete.8.gz
man/man8/pkg-fetch.8.gz
man/man8/pkg-info.8.gz
man/man8/pkg-install.8.gz
man/man8/pkg-key.8.gz
man/man8/pkg-lock.8.gz
man/man8/pkg-query.8.gz
man/man8/pkg-register.8.gz
man/man8/pkg-remove.8.gz
man/man8/pkg-repo.8.gz
man/man8/pkg-repositories.8.gz
man/man8/pkg-rquery.8.gz
man/man8/pkg-search.8.gz
man/man8/pkg-set.8.gz
man/man8/pkg-shell.8.gz
man/man8/pkg-shlib.8.gz
man/man8/pkg-ssh.8.gz
man/man8/pkg-static.8.gz
man/man8/pkg-stats.8.gz
man/man8/pkg-triggers.8.gz
man/man8/pkg-unlock.8.gz
man/man8/pkg-update.8.gz
man/man8/pkg-updating.8.gz
man/man8/pkg-upgrade.8.gz
man/man8/pkg-version.8.gz
man/man8/pkg-which.8.gz
man/man8/pkg.8.gz
sbin/pkg
sbin/pkg-static
@dir include/pkg

View File

@@ -0,0 +1,11 @@
--- Makefile.in.orig 2023-05-07 18:29:33 UTC
+++ Makefile.in
@@ -1306,7 +1306,7 @@ install-exec-hook:
if [ ! -f gawk-$(VERSION)$(EXEEXT) ]; \
then $(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
fi; \
- if [ ! -f awk$(EXEEXT) ]; \
+ if ! /usr/bin/which -s awk; \
then $(LN_S) $${name}$(EXEEXT) awk$(EXEEXT); \
fi; exit 0)

View File

@@ -0,0 +1,20 @@
--- doc/Makefile.in.orig 2021-05-28 18:48:48 UTC
+++ doc/Makefile.in
@@ -2223,7 +2223,7 @@ distdir-am: $(DISTFILES)
dist-info
check-am: all-am
check: check-am
-all-am: Makefile $(INFO_DEPS) $(MANS)
+all-am: Makefile $(MANS)
installdirs:
for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -2279,7 +2279,7 @@ info: info-am
info-am: $(INFO_DEPS)
-install-data-am: install-info-am install-man
+install-data-am: install-man
install-dvi: install-dvi-am

View File

@@ -0,0 +1,11 @@
--- configure.orig 2021-05-28 18:49:43 UTC
+++ configure
@@ -46445,7 +46445,7 @@ find_stack_direction (int *addr, int depth)
return dir + dummy;
}
int
-main (int argc, char *argv)
+main (int argc, char **argv)
{
printf ("%d\n", find_stack_direction (NULL, argc + 20));
return 0;

View File

@@ -0,0 +1,10 @@
--- doc/m4.texi.orig 2016-12-31 22:34:38 UTC
+++ doc/m4.texi
@@ -1,6 +1,7 @@
\input texinfo @c -*- texinfo -*-
@comment ========================================================
@comment %**start of header
+@documentencoding ISO-8859-1
@setfilename m4.info
@include version.texi
@settitle GNU M4 @value{VERSION} macro processor

84
text/gm4/pkg-plist Normal file
View File

@@ -0,0 +1,84 @@
bin/gm4
man/man1/gm4.1.gz
share/info/m4.info
share/info/m4.info-1
share/info/m4.info-2
share/locale/bg/LC_MESSAGES/m4.mo
share/locale/cs/LC_MESSAGES/m4.mo
share/locale/da/LC_MESSAGES/m4.mo
share/locale/de/LC_MESSAGES/m4.mo
share/locale/el/LC_MESSAGES/m4.mo
share/locale/eo/LC_MESSAGES/m4.mo
share/locale/es/LC_MESSAGES/m4.mo
share/locale/fi/LC_MESSAGES/m4.mo
share/locale/fr/LC_MESSAGES/m4.mo
share/locale/ga/LC_MESSAGES/m4.mo
share/locale/gl/LC_MESSAGES/m4.mo
share/locale/hr/LC_MESSAGES/m4.mo
share/locale/id/LC_MESSAGES/m4.mo
share/locale/ja/LC_MESSAGES/m4.mo
share/locale/ko/LC_MESSAGES/m4.mo
share/locale/nl/LC_MESSAGES/m4.mo
share/locale/pl/LC_MESSAGES/m4.mo
share/locale/pt_BR/LC_MESSAGES/m4.mo
share/locale/ro/LC_MESSAGES/m4.mo
share/locale/ru/LC_MESSAGES/m4.mo
share/locale/sr/LC_MESSAGES/m4.mo
share/locale/sv/LC_MESSAGES/m4.mo
share/locale/uk/LC_MESSAGES/m4.mo
share/locale/vi/LC_MESSAGES/m4.mo
share/locale/zh_CN/LC_MESSAGES/m4.mo
share/locale/zh_TW/LC_MESSAGES/m4.mo
@dir share/locale/bg/LC_MESSAGES
@dir share/locale/bg
@dir share/locale/cs/LC_MESSAGES
@dir share/locale/cs
@dir share/locale/da/LC_MESSAGES
@dir share/locale/da
@dir share/locale/de/LC_MESSAGES
@dir share/locale/de
@dir share/locale/el/LC_MESSAGES
@dir share/locale/el
@dir share/locale/eo/LC_MESSAGES
@dir share/locale/eo
@dir share/locale/es/LC_MESSAGES
@dir share/locale/es
@dir share/locale/fi/LC_MESSAGES
@dir share/locale/fi
@dir share/locale/fr/LC_MESSAGES
@dir share/locale/fr
@dir share/locale/ga/LC_MESSAGES
@dir share/locale/ga
@dir share/locale/gl/LC_MESSAGES
@dir share/locale/gl
@dir share/locale/hr/LC_MESSAGES
@dir share/locale/hr
@dir share/locale/id/LC_MESSAGES
@dir share/locale/id
@dir share/locale/ja/LC_MESSAGES
@dir share/locale/ja
@dir share/locale/ko/LC_MESSAGES
@dir share/locale/ko
@dir share/locale/nl/LC_MESSAGES
@dir share/locale/nl
@dir share/locale/pl/LC_MESSAGES
@dir share/locale/pl
@dir share/locale/pt_BR/LC_MESSAGES
@dir share/locale/pt_BR
@dir share/locale/ro/LC_MESSAGES
@dir share/locale/ro
@dir share/locale/ru/LC_MESSAGES
@dir share/locale/ru
@dir share/locale/sr/LC_MESSAGES
@dir share/locale/sr
@dir share/locale/sv/LC_MESSAGES
@dir share/locale/sv
@dir share/locale/uk/LC_MESSAGES
@dir share/locale/uk
@dir share/locale/vi/LC_MESSAGES
@dir share/locale/vi
@dir share/locale/zh_CN/LC_MESSAGES
@dir share/locale/zh_CN
@dir share/locale/zh_TW/LC_MESSAGES
@dir share/locale/zh_TW
@dir share/locale