From 1b4b08b944ee6d905dbd2c7e01bf957c45996465 Mon Sep 17 00:00:00 2001 From: Francis GUDIN Date: Tue, 21 Jul 2026 13:30:28 +0000 Subject: [PATCH 1/4] Updated sysutils/burp to 3.2.0 --- sysutils/burp/Makefile | 29 +++--- sysutils/burp/PLIST | 38 +++++++- sysutils/burp/distinfo | 30 +++--- sysutils/burp/patches/patch-Makefile.am | 13 +++ .../patches/patch-configs_certs_CA_CA.cnf.in | 12 +++ .../patch-configs_certs_CA_burp__ca.in | 13 +++ .../patches/patch-configs_client_burp.conf.in | 34 +++++++ .../patches/patch-configs_server_burp.conf.in | 93 +++++++++++++++++++ .../patch-configs_server_summary__script.in | 11 +++ .../burp/patches/patch-manpages_bedup.8.in | 22 +++++ .../burp/patches/patch-manpages_burp.8.in | 31 +++++++ .../burp/patches/patch-manpages_burp__ca.8.in | 17 ++++ 12 files changed, 310 insertions(+), 33 deletions(-) create mode 100644 sysutils/burp/patches/patch-Makefile.am create mode 100644 sysutils/burp/patches/patch-configs_certs_CA_CA.cnf.in create mode 100644 sysutils/burp/patches/patch-configs_certs_CA_burp__ca.in create mode 100644 sysutils/burp/patches/patch-configs_client_burp.conf.in create mode 100644 sysutils/burp/patches/patch-configs_server_burp.conf.in create mode 100644 sysutils/burp/patches/patch-configs_server_summary__script.in create mode 100644 sysutils/burp/patches/patch-manpages_bedup.8.in create mode 100644 sysutils/burp/patches/patch-manpages_burp.8.in create mode 100644 sysutils/burp/patches/patch-manpages_burp__ca.8.in diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile index 6a35cc3051efc..9a5b90434ed20 100644 --- a/sysutils/burp/Makefile +++ b/sysutils/burp/Makefile @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.9 2023/10/24 22:11:04 wiz Exp $ -DISTNAME= burp-1.4.40 -PKGREVISION= 5 +DISTNAME= burp-3.2.0 CATEGORIES= sysutils archivers -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=burp/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=grke/} +GITHUB_PROJECT= burp +GITHUB_TAG= 3.2.0 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://burp.grke.net/ @@ -19,20 +19,26 @@ PKG_SYSCONFSUBDIR= burp SUBST_CLASSES+= dirs SUBST_STAGE.dirs= pre-install SUBST_MESSAGE.dirs= Fixing directories -SUBST_FILES.dirs= configs/server/burp.conf \ - configs/server/summary_script \ - configs/client/burp.conf \ - configs/certs/CA/CA.cnf \ - configs/certs/CA/burp_ca \ - manpages/*.8 +SUBST_FILES.dirs= configs/server/burp.conf.in \ + configs/server/summary_script.in \ + configs/client/burp.conf.in \ + configs/certs/CA/CA.cnf.in \ + configs/certs/CA/burp_ca.in \ + manpages/*.8.in SUBST_SED.dirs= -e 's,@LIBEXECDIR@,${PREFIX}/libexec/burp,' \ -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' \ -e 's,@SBINDIR@,${PREFIX}/sbin,' -REPLACE_SH+= configs/certs/CA/burp_ca \ +REPLACE_SH+= configs/certs/CA/burp_ca.in \ configs/server/notify_script \ configs/server/timer_script +USE_TOOLS+= autoreconf autoconf automake pkg-config +USE_LIBTOOL= yes + +pre-configure: + set -e; cd ${WRKSRC} && autoreconf -vif + CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ --mandir=${PREFIX}/${PKGMANDIR} \ --sbindir=${PREFIX}/sbin @@ -41,6 +47,7 @@ INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/burp \ libexecdir=${PREFIX}/libexec/burp .include "../../devel/popt/buildlink3.mk" +.include "../../devel/uthash/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../net/librsync/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/sysutils/burp/PLIST b/sysutils/burp/PLIST index 2fa4a83f19ae8..6166977ddda8f 100644 --- a/sysutils/burp/PLIST +++ b/sysutils/burp/PLIST @@ -1,16 +1,44 @@ @comment $NetBSD: PLIST,v 1.2 2016/07/24 23:40:10 rillig Exp $ -libexec/burp/notify_script -libexec/burp/ssl_extra_checks_script -libexec/burp/summary_script -libexec/burp/timer_script +share/burp/scripts/backup_tool_script +share/burp/scripts/notify_script +share/burp/scripts/ssl_extra_checks_script +share/burp/scripts/summary_script +share/burp/scripts/timer_script man/man8/bedup.8 man/man8/burp.8 man/man8/burp_ca.8 man/man8/vss_strip.8 +bin/vss_strip sbin/bedup sbin/burp sbin/burp_ca -sbin/vss_strip +sbin/bsigs +sbin/bsparse +share/doc/burp/CHANGELOG +share/doc/burp/CONTRIBUTORS +share/doc/burp/DONATIONS +share/doc/burp/LICENSE +share/doc/burp/README +share/doc/burp/UPGRADING +share/doc/burp/add-remove.txt +share/doc/burp/autoupgrade.txt +share/doc/burp/backup_phases.txt +share/doc/burp/backup_tool_script.txt +share/doc/burp/baremetal-windows2008.txt +share/doc/burp/baremetal-windows7-hirens.txt +share/doc/burp/baremetal-windows7.txt +share/doc/burp/baremetal-windows7and8.txt +share/doc/burp/burp_ca.txt +share/doc/burp/debug.txt +share/doc/burp/readwrite.txt +share/doc/burp/retention.txt +share/doc/burp/security-models.txt +share/doc/burp/server-basics.txt +share/doc/burp/shuffling.txt +share/doc/burp/status-monitor.txt +share/doc/burp/tests.txt +share/doc/burp/timer_script.txt +share/doc/burp/working_dir.txt share/examples/burp/CA.cnf share/examples/burp/autoupgrade/server/win32/script share/examples/burp/autoupgrade/server/win64/script diff --git a/sysutils/burp/distinfo b/sysutils/burp/distinfo index b85d8a3573fcf..c83e53d576f15 100644 --- a/sysutils/burp/distinfo +++ b/sysutils/burp/distinfo @@ -1,19 +1,15 @@ $NetBSD: distinfo,v 1.7 2021/10/26 11:19:23 nia Exp $ -BLAKE2s (burp-1.4.40.tar.bz2) = d7a7a6f413fc36d9b7d6ec32d0203ba5ebaca8c14995017648115b0174804033 -SHA512 (burp-1.4.40.tar.bz2) = b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c -Size (burp-1.4.40.tar.bz2) = 712937 bytes -SHA1 (patch-Makefile.in) = 3df0458b1fc50cc03d8f69a864830ab52e9d0f8d -SHA1 (patch-configs_certs_CA_CA.cnf) = e58da075d16ecd16454b8b08dd6070101fa24475 -SHA1 (patch-configs_certs_CA_burp__ca) = cdcb697e0a40c612ef3881a0abdcbce89aa78980 -SHA1 (patch-configs_client_burp.conf) = b61837e0a4c358a12060ebb6b4a42e26a9667d0d -SHA1 (patch-configs_server_burp.conf) = bf5a41c09117519b3b198ca1a13951a552a100c1 -SHA1 (patch-configs_server_summary__script) = 068cec66b0634f0746f94891e1390097ec0ef96c -SHA1 (patch-manpages_Makefile.in) = 710bf51bd43c0ecbe8987a843b27fd0e460342f5 -SHA1 (patch-manpages_bedup.8) = 5e1a2e3c42118d98c9b66a0bc5cafb2eb9c09f11 -SHA1 (patch-manpages_burp.8) = 81879e11cf917c36467513aeb440d0ab2dbad142 -SHA1 (patch-manpages_burp__ca.8) = f9ac9ffe1f67df040c939bb1afcf614869695034 -SHA1 (patch-src-xattr.c) = 105aa2c67fde7007b525d6ff93e0d9ce67ee2f4f -SHA1 (patch-src_handy.c) = 6d3fe34734c6392a28a59ed1491688d2f12e0a66 -SHA1 (patch-src_msg.c) = 2a8f542f801f2d4ace5d9335d3abb7490cba82d7 -SHA1 (patch-src_server.c) = 3dc518b24bd866d0ff7cc9c834d4fde810cacb74 +BLAKE2s (burp-3.2.0.tar.gz) = 1f79d602e34f4d03b2052fbd5853b054ad571afd0b59c7a802f65bbdd9f55766 +SHA512 (burp-3.2.0.tar.gz) = 13affe243f1bb50460ae6bcece580a18718acb01695e2ef804ce519335a733f02c6a89d5c3263963794ff3714a0c693dd8a2f69ae43774088c3b2c63570162df +Size (burp-3.2.0.tar.gz) = 550673 bytes +SHA1 (patch-Makefile.am) = 7ba740c6e77d38684bbe984dd14838feec55755c +SHA1 (patch-configs_certs_CA_CA.cnf.in) = f0945a96f18d2ebab70affdfd70f3c66a876cd50 +SHA1 (patch-configs_certs_CA_burp__ca.in) = e6043ca0b28fd6755b6c69824aa6466719d94ffd +SHA1 (patch-configs_client_burp.conf.in) = a75e642ec2ee9aeecbe042b19e674acac7761273 +SHA1 (patch-configs_server_burp.conf.in) = 8b37b26262b3bdb748f1bfc0e746138dc00ba7ff +SHA1 (patch-configs_server_summary__script.in) = 4c825ff342421f92f04926664dce6ab4e362b526 +SHA1 (patch-manpages_bedup.8.in) = 93c12f03cec4a3dff8621472b021fe3ff223de6c +SHA1 (patch-manpages_burp.8.in) = fd8d3440e16a1a53d66298f58f17d213af8ce13e +SHA1 (patch-manpages_burp__ca.8.in) = 75590d44c979c6abbe95504d4cb87901cfaf7a68 + diff --git a/sysutils/burp/patches/patch-Makefile.am b/sysutils/burp/patches/patch-Makefile.am new file mode 100644 index 0000000000000..3b576fb13c279 --- /dev/null +++ b/sysutils/burp/patches/patch-Makefile.am @@ -0,0 +1,13 @@ +$NetBSD$ + +--- Makefile.am.orig 2026-07-20 14:50:45.132486980 +0000 ++++ Makefile.am +@@ -388,7 +388,7 @@ clean-local-check: + $(configs): Makefile + + $(PACKAGE_TARNAME): main +- $(AM_V_at)mv -fv main $(PACKAGE_TARNAME) ++ $(AM_V_at)mv -f main $(PACKAGE_TARNAME) + + $(PACKAGE_TARNAME).conf: + $(AM_V_at)rm -f $@ diff --git a/sysutils/burp/patches/patch-configs_certs_CA_CA.cnf.in b/sysutils/burp/patches/patch-configs_certs_CA_CA.cnf.in new file mode 100644 index 0000000000000..7f148c62478bd --- /dev/null +++ b/sysutils/burp/patches/patch-configs_certs_CA_CA.cnf.in @@ -0,0 +1,12 @@ +$NetBSD$ + +--- configs/certs/CA/CA.cnf.in.orig 2026-07-21 12:36:40.240762309 +0000 ++++ configs/certs/CA/CA.cnf.in +@@ -1,6 +1,6 @@ + # simple config for burp_ca + +-CA_DIR = @sysconfdir@/CA ++CA_DIR = @PKG_SYSCONFDIR@/CA + + + [ ca ] diff --git a/sysutils/burp/patches/patch-configs_certs_CA_burp__ca.in b/sysutils/burp/patches/patch-configs_certs_CA_burp__ca.in new file mode 100644 index 0000000000000..2a3028f96a687 --- /dev/null +++ b/sysutils/burp/patches/patch-configs_certs_CA_burp__ca.in @@ -0,0 +1,13 @@ +$NetBSD$ + +--- configs/certs/CA/burp_ca.in.orig 2026-07-21 12:44:39.659616295 +0000 ++++ configs/certs/CA/burp_ca.in +@@ -66,7 +66,7 @@ esac + # Try NetBSD style. + [ -n "$name" ] || name="$(hostname)" + +-etc="@sysconfdir@" ++etc="@PKG_SYSCONFDIR@" + dir="$etc"/CA + conf="$etc"/CA.cnf + days= diff --git a/sysutils/burp/patches/patch-configs_client_burp.conf.in b/sysutils/burp/patches/patch-configs_client_burp.conf.in new file mode 100644 index 0000000000000..df4290b6e1ef7 --- /dev/null +++ b/sysutils/burp/patches/patch-configs_client_burp.conf.in @@ -0,0 +1,34 @@ +$NetBSD$ + +--- configs/client/burp.conf.in.orig 2026-07-21 12:46:43.560539930 +0000 ++++ configs/client/burp.conf.in +@@ -17,7 +17,7 @@ progress_counter = 1 + # network_timeout = 7200 + # The directory to which autoupgrade files will be downloaded. + # To never autoupgrade, leave it commented out. +-# autoupgrade_dir=@sysconfdir@/autoupgrade/client ++# autoupgrade_dir=@PKG_SYSCONFDIR@/autoupgrade/client + # OS path component for the autoupgrade directory on the server. + # autoupgrade_os=test_os + # Wait a random number of seconds between 0 and the given number before +@@ -61,16 +61,16 @@ cross_all_filesystems=0 + # Uncomment the following lines to automatically generate a certificate signing + # request and send it to the server. + ca_@name@_ca = @sbindir@/@name@_ca +-ca_csr_dir = @sysconfdir@/CA-client ++ca_csr_dir = @PKG_SYSCONFDIR@/CA-client + + # SSL certificate authority - same file on both server and client +-ssl_cert_ca = @sysconfdir@/ssl_cert_ca.pem ++ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem + + # Client SSL certificate +-ssl_cert = @sysconfdir@/ssl_cert-client.pem ++ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-client.pem + + # Client SSL key +-ssl_key = @sysconfdir@/ssl_cert-client.key ++ssl_key = @PKG_SYSCONFDIR@/ssl_cert-client.key + + # Client SSL ciphers + #ssl_ciphers = diff --git a/sysutils/burp/patches/patch-configs_server_burp.conf.in b/sysutils/burp/patches/patch-configs_server_burp.conf.in new file mode 100644 index 0000000000000..cab2886b1c6fc --- /dev/null +++ b/sysutils/burp/patches/patch-configs_server_burp.conf.in @@ -0,0 +1,93 @@ +$NetBSD$ + +--- configs/server/burp.conf.in.orig 2026-07-21 12:57:10.135718884 +0000 ++++ configs/server/burp.conf.in +@@ -19,7 +19,7 @@ max_children = 5 + + directory = @localstatedir@/spool/@name@ + dedup_group = global +-clientconfdir = @sysconfdir@/clientconfdir ++clientconfdir = @PKG_SYSCONFDIR@/clientconfdir + pidfile = @runstatedir@/@name@.server.pid + hardlinked_archive = 0 + working_dir_recovery_method = delete +@@ -56,7 +56,7 @@ version_warn = 1 + + # Location of autoupgrade files to serve to clients. Leave it commented out + # to not autoupgrade clients. +-# autoupgrade_dir = @sysconfdir@/autoupgrade/server ++# autoupgrade_dir = @PKG_SYSCONFDIR@/autoupgrade/server + + # You can have as many 'keep' lines as you like. + # For example, if running backups daily, setting keep 7, keep 4, keep 6 will keep +@@ -75,23 +75,23 @@ keep = 7 + # ca_conf does not exist, the server will create, populate it, and the paths + # indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile below will be + # overwritten. See docs/@name@_ca.txt for more information. +-ca_conf = @sysconfdir@/CA.cnf ++ca_conf = @PKG_SYSCONFDIR@/CA.cnf + ca_name = @name@CA + ca_server_name = @name@server +-ca_@name@_ca = @sbindir@/@name@_ca ++ca_@name@_ca = @SBINDIR@/@name@_ca + + # Check for revoked certificates in the certificate revocation list. + # Turn this off if you use the old ssl_extra_checks_script server script. + ca_crl_check = 1 + + # SSL certificate authority - same file on both server and client +-ssl_cert_ca = @sysconfdir@/ssl_cert_ca.pem ++ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem + + # Server SSL certificate +-ssl_cert = @sysconfdir@/ssl_cert-server.pem ++ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-server.pem + + # Server SSL key +-ssl_key = @sysconfdir@/ssl_cert-server.key ++ssl_key = @PKG_SYSCONFDIR@/ssl_cert-server.key + + # Server SSL ciphers + #ssl_ciphers = +@@ -103,7 +103,7 @@ ssl_key = @sysconfdir@/ssl_cert-server.k + #ssl_key_password = password + + # Server DH file. +-ssl_dhfile = @sysconfdir@/dhfile.pem ++ssl_dhfile = @PKG_SYSCONFDIR@/dhfile.pem + + # The default timer_script treats the first timer_arg as the minimum interval + # Ensure that 20 hours elapse between backups +@@ -124,7 +124,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06 + # %b - "backup"/"restore"/"verify" + # %c - client name + # %w - number of warnings, if any +-#notify_success_script = @scriptdir@/notify_script ++#notify_success_script = @LIBEXECDIR@/notify_script + #notify_success_arg = sendmail -t + #notify_success_arg = To: youremail@example.com + #notify_success_arg = From: @name@ +@@ -138,7 +138,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06 + #notify_success_changes_only = 1 + + # Uncomment the following for email notifications of backups that failed. +-#notify_failure_script = @scriptdir@/notify_script ++#notify_failure_script = @LIBEXECDIR@/notify_script + #notify_failure_arg = sendmail -t + #notify_failure_arg = To: youremail@example.com + #notify_failure_arg = From: @name@ +@@ -147,10 +147,10 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06 + + # The server can run scripts on each connection after authentication and before + # disconnecting. +-#server_script_pre = @scriptdir@/ssl_extra_checks_script +-#server_script_pre_arg = @sysconfdir@/crl +-#server_script_pre_arg = @sysconfdir@/@name@-server.conf +-#server_script_pre_arg = @scriptdir@/server-pre-script.local ++#server_script_pre = @LIBEXECDIR@/ssl_extra_checks_script ++#server_script_pre_arg = @PKG_SYSCONFDIR@/crl ++#server_script_pre_arg = @PKG_SYSCONFDIR@/@name@-server.conf ++#server_script_pre_arg = @LIBEXECDIR@/server-pre-script.local + # Set server_script_pre_notify to 1 to have notifications on server_script_pre + # returning non-zero. Most people will want to leave this off - it could + # result in a lot of emails because clients normally connect once every 20 diff --git a/sysutils/burp/patches/patch-configs_server_summary__script.in b/sysutils/burp/patches/patch-configs_server_summary__script.in new file mode 100644 index 0000000000000..b24bb9daf8987 --- /dev/null +++ b/sysutils/burp/patches/patch-configs_server_summary__script.in @@ -0,0 +1,11 @@ +$NetBSD$ + +--- configs/server/summary_script.in.orig 2026-07-21 13:03:50.453327968 +0000 ++++ configs/server/summary_script.in +@@ -9,5 +9,5 @@ fi + echo "From: @name@" + echo "Subject: $3" + echo "Content-Type: text/plain; charset=utf-8" +- @sbindir@/@name@ -c "$1" -a S ++ @SBINDIR@/@name@ -c "$1" -a S + echo) | /usr/sbin/sendmail -t diff --git a/sysutils/burp/patches/patch-manpages_bedup.8.in b/sysutils/burp/patches/patch-manpages_bedup.8.in new file mode 100644 index 0000000000000..c67874ded63a2 --- /dev/null +++ b/sysutils/burp/patches/patch-manpages_bedup.8.in @@ -0,0 +1,22 @@ +$NetBSD$ + +--- manpages/bedup.8.in.orig 2026-07-21 13:07:33.745245559 +0000 ++++ manpages/bedup.8.in +@@ -14,7 +14,7 @@ A file deduplication program with additi + .SH OPTIONS + .TP + \fB\-c\fR \fBpath\fR +-Path to config file (default: /etc/@name@/@name@.conf). ++Path to config file (default: @PKG_SYSCONFDIR@/@name@/@name@.conf). + .TP + \fB\-g\fR \fB\fR + Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server. +@@ -40,7 +40,7 @@ Print duplicate paths. Useful if you wan + \fB\-V\fR \fB\fR + Print version and exit.\fR + .TP +-By default, bedup will read /etc/@name@/@name@.conf and deduplicate client storage directories using special knowledge of the structure.\fR ++By default, bedup will read @PKG_SYSCONFDIR@/@name@/@name@.conf and deduplicate client storage directories using special knowledge of the structure.\fR + .TP + With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating @name@ storage directories. + diff --git a/sysutils/burp/patches/patch-manpages_burp.8.in b/sysutils/burp/patches/patch-manpages_burp.8.in new file mode 100644 index 0000000000000..a0b0cc34786bc --- /dev/null +++ b/sysutils/burp/patches/patch-manpages_burp.8.in @@ -0,0 +1,31 @@ +$NetBSD$ + +--- manpages/burp.8.in.orig 2026-07-21 13:09:21.747319462 +0000 ++++ manpages/burp.8.in +@@ -17,7 +17,7 @@ BackUp and Restore Program. + .TP + \fB\-c\fR \fB[path]\fR + Short for 'config file'. The argument is a path to the config file. The default +-is /etc/@name@/@name@.conf. ++is @PKG_SYSCONFDIR@/@name@/@name@.conf. + .TP + \fB\-F\fR \fB\fR + Foreground mode. The server will fork into the background and run as a daemon if you do not give this option. +@@ -70,7 +70,7 @@ backups. + .TP + \fB\-c\fR \fB[path]\fR + Short for 'config file'. The argument is a path to the config file. The default +-is /etc/@name@/@name@.conf, or %PROGRAMFILES%\\@human_name@\\@name@.conf on Windows. ++is @PKG_SYSCONFDIR@/@name@/@name@.conf, or %PROGRAMFILES%\\@human_name@\\@name@.conf on Windows. + .TP + \fB\-C\fR \fB[client]\fR + Allows you to specify an alternative client to list or restore from. Requires that the server configuration of the alternative client permits your client to do this. See the 'restore_client' and 'super_client' options. +@@ -497,7 +497,7 @@ If this is set to 1, server_script_post + Path to autoupgrade directory from which upgrades are downloaded. The option can be left unset in order not to autoupgrade clients. Please see docs/autoupgrade.txt in the source package for more help with this option. + .TP + \fBca_conf=[path]\fR +-Path to certificate authority configuration file. The CA configuration file will usually be /etc/@name@/CA.cnf. The CA directory indicated by CA.cnf will usually be /etc/@name@/CA. If ca_conf is set and the CA directory does not exist, the server will create, populate it, and the paths indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile will be overwritten. For more detailed information on this and the other ca_* options, please see docs/@name@_ca.txt. ++Path to certificate authority configuration file. The CA configuration file will usually be @PKG_SYSCONFDIR@/@name@/CA.cnf. The CA directory indicated by CA.cnf will usually be @PKG_SYSCONFDIR@/@name@/CA. If ca_conf is set and the CA directory does not exist, the server will create, populate it, and the paths indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile will be overwritten. For more detailed information on this and the other ca_* options, please see docs/@name@_ca.txt. + .TP + \fBca_name=[name]\fR + Name of the CA that the server will generate when using the ca_conf option. diff --git a/sysutils/burp/patches/patch-manpages_burp__ca.8.in b/sysutils/burp/patches/patch-manpages_burp__ca.8.in new file mode 100644 index 0000000000000..22215b77e69ca --- /dev/null +++ b/sysutils/burp/patches/patch-manpages_burp__ca.8.in @@ -0,0 +1,17 @@ +$NetBSD$ + +--- manpages/burp_ca.8.in.orig 2026-07-21 13:10:59.718331464 +0000 ++++ manpages/burp_ca.8.in +@@ -38,10 +38,10 @@ revoke certificate with serial number + generate certificate revoke list + .TP + \fB\-d|\-\-dir\fR \fB\fR +-ca output dir (default: /etc/@name@/CA) ++ca output dir (default: @PKG_SYSCONFDIR@/@name@/CA) + .TP + \fB\-c|\-\-config\fR \fB\fR +-config file (default: /etc/@name@/CA.cnf) ++config file (default: @PKG_SYSCONFDIR@/@name@/CA.cnf) + .TP + \fB\-n|\-\-name\fR \fB\fR + name (default: builder) From 9fb9f0af941b1fff680f9e5494900602774d941e Mon Sep 17 00:00:00 2001 From: Francis GUDIN Date: Wed, 22 Jul 2026 10:09:08 +0000 Subject: [PATCH 2/4] Generate and include example configs files in the package install-all as INSTALL_TARGET + PLIST adjusted --- sysutils/burp/Makefile | 2 ++ sysutils/burp/PLIST | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile index 9a5b90434ed20..043c909a0939d 100644 --- a/sysutils/burp/Makefile +++ b/sysutils/burp/Makefile @@ -39,6 +39,8 @@ USE_LIBTOOL= yes pre-configure: set -e; cd ${WRKSRC} && autoreconf -vif +INSTALL_TARGET= install-all + CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ --mandir=${PREFIX}/${PKGMANDIR} \ --sbindir=${PREFIX}/sbin diff --git a/sysutils/burp/PLIST b/sysutils/burp/PLIST index 6166977ddda8f..a6decfde99177 100644 --- a/sysutils/burp/PLIST +++ b/sysutils/burp/PLIST @@ -40,8 +40,6 @@ share/doc/burp/tests.txt share/doc/burp/timer_script.txt share/doc/burp/working_dir.txt share/examples/burp/CA.cnf -share/examples/burp/autoupgrade/server/win32/script -share/examples/burp/autoupgrade/server/win64/script share/examples/burp/burp-server.conf share/examples/burp/burp.conf share/examples/burp/clientconfdir/incexc/example From 4a4b4bcf4d94c9ca955bb37c177641f03dccb2b3 Mon Sep 17 00:00:00 2001 From: Francis GUDIN Date: Wed, 22 Jul 2026 10:14:33 +0000 Subject: [PATCH 3/4] remove obsolete patch files --- sysutils/burp/patches/patch-Makefile.in | 22 ----- .../patches/patch-configs_certs_CA_CA.cnf | 13 --- .../patches/patch-configs_certs_CA_burp__ca | 13 --- .../patches/patch-configs_client_burp.conf | 36 -------- .../patches/patch-configs_server_burp.conf | 92 ------------------- .../patch-configs_server_summary__script | 11 --- .../burp/patches/patch-manpages_Makefile.in | 15 --- sysutils/burp/patches/patch-manpages_bedup.8 | 22 ----- sysutils/burp/patches/patch-manpages_burp.8 | 31 ------- .../burp/patches/patch-manpages_burp__ca.8 | 17 ---- 10 files changed, 272 deletions(-) delete mode 100644 sysutils/burp/patches/patch-Makefile.in delete mode 100644 sysutils/burp/patches/patch-configs_certs_CA_CA.cnf delete mode 100644 sysutils/burp/patches/patch-configs_certs_CA_burp__ca delete mode 100644 sysutils/burp/patches/patch-configs_client_burp.conf delete mode 100644 sysutils/burp/patches/patch-configs_server_burp.conf delete mode 100644 sysutils/burp/patches/patch-configs_server_summary__script delete mode 100644 sysutils/burp/patches/patch-manpages_Makefile.in delete mode 100644 sysutils/burp/patches/patch-manpages_bedup.8 delete mode 100644 sysutils/burp/patches/patch-manpages_burp.8 delete mode 100644 sysutils/burp/patches/patch-manpages_burp__ca.8 diff --git a/sysutils/burp/patches/patch-Makefile.in b/sysutils/burp/patches/patch-Makefile.in deleted file mode 100644 index eee73af13b0fe..0000000000000 --- a/sysutils/burp/patches/patch-Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- Makefile.in.orig 2015-07-01 11:45:08.000000000 +0000 -+++ Makefile.in -@@ -112,12 +112,13 @@ installation: install - - install: installdirs - @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done -+ ${BSD_INSTALL_SCRIPT_DIR} ${DESTDIR}${libexecdir} -+ ${BSD_INSTALL_SCRIPT} configs/server/notify_script $(DESTDIR)${libexecdir} -+ ${BSD_INSTALL_SCRIPT} configs/server/ssl_extra_checks_script $(DESTDIR)${libexecdir} -+ ${BSD_INSTALL_SCRIPT} configs/server/summary_script $(DESTDIR)${libexecdir} -+ ${BSD_INSTALL_SCRIPT} configs/server/timer_script $(DESTDIR)${libexecdir} - @if [ ! -f $(DESTDIR)$(sysconfdir)/burp-server.conf ] ; then cp configs/server/burp.conf $(DESTDIR)$(sysconfdir)/burp-server.conf ; fi - @if [ ! -f $(DESTDIR)$(sysconfdir)/burp.conf ] ; then cp configs/client/burp.conf $(DESTDIR)$(sysconfdir)/burp.conf ; fi -- @if [ ! -f $(DESTDIR)$(sysconfdir)/notify_script ] ; then cp configs/server/notify_script $(DESTDIR)$(sysconfdir)/notify_script && chmod 755 $(DESTDIR)$(sysconfdir)/notify_script ; fi -- @if [ ! -f $(DESTDIR)$(sysconfdir)/ssl_extra_checks_script ] ; then cp configs/server/ssl_extra_checks_script $(DESTDIR)$(sysconfdir)/ssl_extra_checks_script && chmod 755 $(DESTDIR)$(sysconfdir)/ssl_extra_checks_script ; fi -- @if [ ! -f $(DESTDIR)$(sysconfdir)/summary_script ] ; then cp configs/server/summary_script $(DESTDIR)$(sysconfdir)/summary_script && chmod 755 $(DESTDIR)$(sysconfdir)/summary_script ; fi -- @if [ ! -f $(DESTDIR)$(sysconfdir)/timer_script ] ; then cp configs/server/timer_script $(DESTDIR)$(sysconfdir)/timer_script && chmod 755 $(DESTDIR)$(sysconfdir)/timer_script ; fi - @if [ ! -f $(DESTDIR)$(sysconfdir)/autoupgrade/server/win32/script ] ; then cp configs/server/autoupgrade/windows.script $(DESTDIR)$(sysconfdir)/autoupgrade/server/win32/script ; fi - @if [ ! -f $(DESTDIR)$(sysconfdir)/autoupgrade/server/win64/script ] ; then cp configs/server/autoupgrade/windows.script $(DESTDIR)$(sysconfdir)/autoupgrade/server/win64/script ; fi - @if [ ! -f $(DESTDIR)$(sysconfdir)/CA.cnf ] ; then cp configs/certs/CA/CA.cnf $(DESTDIR)$(sysconfdir)/CA.cnf ; fi diff --git a/sysutils/burp/patches/patch-configs_certs_CA_CA.cnf b/sysutils/burp/patches/patch-configs_certs_CA_CA.cnf deleted file mode 100644 index 360b5117fe242..0000000000000 --- a/sysutils/burp/patches/patch-configs_certs_CA_CA.cnf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-configs_certs_CA_CA.cnf,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- configs/certs/CA/CA.cnf.orig 2015-07-01 11:45:08.000000000 +0000 -+++ configs/certs/CA/CA.cnf -@@ -1,7 +1,7 @@ - # simple config for burp_ca - - RANDFILE = /dev/urandom --CA_DIR = /etc/burp/CA -+CA_DIR = @PKG_SYSCONFDIR@/CA - - - [ ca ] diff --git a/sysutils/burp/patches/patch-configs_certs_CA_burp__ca b/sysutils/burp/patches/patch-configs_certs_CA_burp__ca deleted file mode 100644 index c586e02ba53de..0000000000000 --- a/sysutils/burp/patches/patch-configs_certs_CA_burp__ca +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-configs_certs_CA_burp__ca,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- configs/certs/CA/burp_ca.orig 2015-05-29 23:33:04.000000000 +0000 -+++ configs/certs/CA/burp_ca -@@ -7,7 +7,7 @@ - - set -e - --etc=/etc/burp -+etc=@PKG_SYSCONFDIR@ - dir=${etc}/CA - conf=${etc}/CA.cnf - diff --git a/sysutils/burp/patches/patch-configs_client_burp.conf b/sysutils/burp/patches/patch-configs_client_burp.conf deleted file mode 100644 index 957616f7ad85f..0000000000000 --- a/sysutils/burp/patches/patch-configs_client_burp.conf +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-configs_client_burp.conf,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- configs/client/burp.conf.orig 2015-07-01 11:45:08.000000000 +0000 -+++ configs/client/burp.conf -@@ -15,7 +15,7 @@ progress_counter = 1 - # network_timeout = 7200 - # The directory to which autoupgrade files will be downloaded. - # To never autoupgrade, leave it commented out. --# autoupgrade_dir=/etc/burp/autoupgrade/client -+# autoupgrade_dir=@PKG_SYSCONFDIR@/autoupgrade/client - # OS path component for the autoupgrade directory on the server. - # autoupgrade_os=test_os - -@@ -41,17 +41,17 @@ cross_all_filesystems=0 - - # Uncomment the following lines to automatically generate a certificate signing - # request and send it to the server. --ca_burp_ca = /usr/sbin/burp_ca --ca_csr_dir = /etc/burp/CA-client -+ca_burp_ca = /opt/pkgsrc/sbin/burp_ca -+ca_csr_dir = @PKG_SYSCONFDIR@/CA-client - - # SSL certificate authority - same file on both server and client --ssl_cert_ca = /etc/burp/ssl_cert_ca.pem -+ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem - - # Client SSL certificate --ssl_cert = /etc/burp/ssl_cert-client.pem -+ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-client.pem - - # Client SSL key --ssl_key = /etc/burp/ssl_cert-client.key -+ssl_key = @PKG_SYSCONFDIR@/ssl_cert-client.key - - # Client SSL ciphers - #ssl_ciphers = diff --git a/sysutils/burp/patches/patch-configs_server_burp.conf b/sysutils/burp/patches/patch-configs_server_burp.conf deleted file mode 100644 index 14e631a38030a..0000000000000 --- a/sysutils/burp/patches/patch-configs_server_burp.conf +++ /dev/null @@ -1,92 +0,0 @@ -$NetBSD: patch-configs_server_burp.conf,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- configs/server/burp.conf.orig 2015-07-01 11:45:08.000000000 +0000 -+++ configs/server/burp.conf -@@ -4,7 +4,7 @@ mode = server - port = 4971 - status_port = 4972 - directory = /var/spool/burp --clientconfdir = /etc/burp/clientconfdir -+clientconfdir = @PKG_SYSCONFDIR@/clientconfdir - pidfile = /var/run/burp.server.pid - hardlinked_archive = 0 - working_dir_recovery_method = delete -@@ -39,7 +39,7 @@ version_warn = 1 - - # Location of autoupgrade files to serve to clients. Leave it commented out - # to not autoupgrade clients. --# autoupgrade_dir = /etc/burp/autoupgrade/server -+# autoupgrade_dir = @PKG_SYSCONFDIR@/autoupgrade/server - - # You can have as many 'keep' lines as you like. - # For example, if running backups daily, setting 7, 4, 6 will keep -@@ -58,19 +58,19 @@ keep = 7 - # ca_conf does not exist, the server will create, populate it, and the paths - # indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile below will be - # overwritten. See docs/burp_ca.txt for more information. --ca_conf = /etc/burp/CA.cnf -+ca_conf = @PKG_SYSCONFDIR@/CA.cnf - ca_name = burpCA - ca_server_name = burpserver --ca_burp_ca = /usr/sbin/burp_ca -+ca_burp_ca = @SBINDIR@/burp_ca - - # SSL certificate authority - same file on both server and client --ssl_cert_ca = /etc/burp/ssl_cert_ca.pem -+ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem - - # Server SSL certificate --ssl_cert = /etc/burp/ssl_cert-server.pem -+ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-server.pem - - # Server SSL key --ssl_key = /etc/burp/ssl_cert-server.key -+ssl_key = @PKG_SYSCONFDIR@/ssl_cert-server.key - - # Server SSL ciphers - #ssl_ciphers = -@@ -79,9 +79,9 @@ ssl_key = /etc/burp/ssl_cert-server.key - ssl_key_password = password - - # Server DH file. --ssl_dhfile = /etc/burp/dhfile.pem -+ssl_dhfile = @PKG_SYSCONFDIR@/dhfile.pem - --timer_script = /etc/burp/timer_script -+timer_script = @LIBEXECDIR@/burp/timer_script - # Ensure that 20 hours elapse between backups - # Available units: - # s (seconds), m (minutes), h (hours), d (days), w (weeks), n (months) -@@ -99,7 +99,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06 - # %b - "backup"/"restore"/"verify" - # %c - client name - # %w - number of warnings, if any --#notify_success_script = /etc/burp/notify_script -+#notify_success_script = @LIBEXECDIR@/notify_script - #notify_success_arg = sendmail -t - #notify_success_arg = To: youremail@example.com - #notify_success_arg = From: burp -@@ -112,7 +112,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06 - #notify_success_changes_only = 1 - - # Uncomment the following for email notifications of backups that failed. --#notify_failure_script = /etc/burp/notify_script -+#notify_failure_script = @LIBEXECDIR@/notify_script - #notify_failure_arg = sendmail -t - #notify_failure_arg = To: youremail@example.com - #notify_failure_arg = From: burp -@@ -120,10 +120,10 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06 - - # The server can run scripts on each connection after authentication and before - # disconnecting. --#server_script_pre = /etc/burp/ssl_extra_checks_script --#server_script_pre_arg = /etc/burp/crl --#server_script_pre_arg = /etc/burp/burp-server.conf --#server_script_pre_arg = /etc/burp/server-pre-script.local -+#server_script_pre = @LIBEXECDIR@/ssl_extra_checks_script -+#server_script_pre_arg = @PKG_SYSCONFDIR@/crl -+#server_script_pre_arg = @PKG_SYSCONFDIR@/burp-server.conf -+#server_script_pre_arg = @PKG_SYSCONFDIR@/server-pre-script.local - # Set server_script_pre_notify to 1 to have notifications on server_script_pre - # returning non-zero. Most people will want to leave this off - it could - # result in a lot of emails because clients normally connect once every 20 diff --git a/sysutils/burp/patches/patch-configs_server_summary__script b/sysutils/burp/patches/patch-configs_server_summary__script deleted file mode 100644 index 74268a6600656..0000000000000 --- a/sysutils/burp/patches/patch-configs_server_summary__script +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-configs_server_summary__script,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- configs/server/summary_script.orig 2015-05-12 10:52:36.000000000 +0000 -+++ configs/server/summary_script -@@ -8,5 +8,5 @@ fi - (echo "To: $2" - echo "From: burp" - echo "Subject: $3" -- /usr/sbin/burp -c "$1" -a S -+ @SBINDIR@/burp -c "$1" -a S - echo) | /usr/sbin/sendmail -t diff --git a/sysutils/burp/patches/patch-manpages_Makefile.in b/sysutils/burp/patches/patch-manpages_Makefile.in deleted file mode 100644 index f3df851d2be57..0000000000000 --- a/sysutils/burp/patches/patch-manpages_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-manpages_Makefile.in,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- manpages/Makefile.in.orig 2015-07-01 11:45:08.000000000 +0000 -+++ manpages/Makefile.in -@@ -17,9 +17,7 @@ depend: - install: - $(MKDIR) $(DESTDIR)/$(mandir)/man8 - for I in ${MAN8}; \ -- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ -- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \ -- rm -f $$I.gz); \ -+ do $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \ - done - - uninstall: diff --git a/sysutils/burp/patches/patch-manpages_bedup.8 b/sysutils/burp/patches/patch-manpages_bedup.8 deleted file mode 100644 index b3116cb26eccf..0000000000000 --- a/sysutils/burp/patches/patch-manpages_bedup.8 +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-manpages_bedup.8,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- manpages/bedup.8.orig 2015-09-12 22:49:17.926333040 +0000 -+++ manpages/bedup.8 -@@ -16,7 +16,7 @@ A file deduplication program with additi - .SH OPTIONS - .TP - \fB\-c\fR \fBpath\fR --Path to config file (default: /etc/burp/burp.conf). -+Path to config file (default: @PKG_SYSCONFDIR@/burp.conf). - .TP - \fB\-g\fR \fB\fR - Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server. -@@ -42,7 +42,7 @@ Print duplicate paths. Useful if you wan - \fB\-V\fR \fB\fR - Print version and exit.\fR - .TP --By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR -+By default, bedup will read @PKG_SYSCONFDIR@/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR - .TP - With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories. - diff --git a/sysutils/burp/patches/patch-manpages_burp.8 b/sysutils/burp/patches/patch-manpages_burp.8 deleted file mode 100644 index 353d7fce3cb96..0000000000000 --- a/sysutils/burp/patches/patch-manpages_burp.8 +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-manpages_burp.8,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- manpages/burp.8.orig 2015-09-12 22:49:19.966332952 +0000 -+++ manpages/burp.8 -@@ -17,7 +17,7 @@ BackUp and Restore Program. - .TP - \fB\-c\fR \fB[path]\fR - Short for 'config file'. The argument is a path to the config file. The default --is /etc/burp/burp.conf. -+is @PKG_SYSCONFDIR@/burp.conf. - .TP - \fB\-n\fR \fB\fR - No forking mode. The program will accept a single query, deal with it, and then -@@ -66,7 +66,7 @@ backups. - .TP - \fB\-c\fR \fB[path]\fR - Short for 'config file'. The argument is a path to the config file. The default --is /etc/burp/burp.conf, or %PROGRAMFILES%\\Burp\\burp.conf on Windows. -+is @PKG_SYSCONFDIR@/burp.conf, or %PROGRAMFILES%\\Burp\\burp.conf on Windows. - .TP - \fB\-C\fR \fB[client]\fR - Allows you to specify an alternative client to list or restore from. Requires that the server configuration of the alternative client permits your client to do this. See the 'restore_client' option. -@@ -373,7 +373,7 @@ If this is set to 1, server_script_post - Path to autoupgrade directory from which upgrades are downloaded. The option can be left unset in order not to autoupgrade clients. Please see docs/autoupgrade.txt in the source package for more help with this option. - .TP - \fBca_conf=[path]\fR --Path to certificate authority configuration file. The CA configuration file will usually be /etc/burp/CA.cnf. The CA directory indicated by CA.cnf will usually be /etc/burp/CA. If ca_conf is set and the CA directory does not exist, the server will create, populate it, and the paths indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile will be overwritten. For more detailed information on this and the other ca_* options, please see docs/burp_ca.txt. -+Path to certificate authority configuration file. The CA configuration file will usually be @PKG_SYSCONFDIR@/CA.cnf. The CA directory indicated by CA.cnf will usually be @PKG_SYSCONFDIR@/CA. If ca_conf is set and the CA directory does not exist, the server will create, populate it, and the paths indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile will be overwritten. For more detailed information on this and the other ca_* options, please see docs/burp_ca.txt. - .TP - \fBca_name=[name]\fR - Name of the CA that the server will generate when using the ca_conf option. diff --git a/sysutils/burp/patches/patch-manpages_burp__ca.8 b/sysutils/burp/patches/patch-manpages_burp__ca.8 deleted file mode 100644 index 65e41f432f26d..0000000000000 --- a/sysutils/burp/patches/patch-manpages_burp__ca.8 +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-manpages_burp__ca.8,v 1.1 2015/09/12 22:55:18 joerg Exp $ - ---- manpages/burp_ca.8.orig 2015-09-12 22:49:27.626332624 +0000 -+++ manpages/burp_ca.8 -@@ -38,10 +38,10 @@ revoke certificate with serial number - generate certificate revoke list - .TP - \fB\-d|\-\-dir\fR \fB\fR --ca output dir (default: /etc/burp/CA) -+ca output dir (default: @PKG_SYSCONFDIR@/CA) - .TP - \fB\-c|\-\-config\fR \fB\fR --config file (default: /etc/burp/CA.cnf) -+config file (default: @PKG_SYSCONFDIR@/CA.cnf) - .TP - \fB\-n|\-\-name\fR \fB\fR - name (default: builder) From c3f8ac263b86c2293bdacc0130e201178c6d90e5 Mon Sep 17 00:00:00 2001 From: Francis GUDIN Date: Wed, 22 Jul 2026 10:31:39 +0000 Subject: [PATCH 4/4] remove more obsolete patch files --- sysutils/burp/patches/patch-src-xattr.c | 24 ------------- sysutils/burp/patches/patch-src_handy.c | 44 ------------------------ sysutils/burp/patches/patch-src_msg.c | 24 ------------- sysutils/burp/patches/patch-src_server.c | 15 -------- 4 files changed, 107 deletions(-) delete mode 100644 sysutils/burp/patches/patch-src-xattr.c delete mode 100644 sysutils/burp/patches/patch-src_handy.c delete mode 100644 sysutils/burp/patches/patch-src_msg.c delete mode 100644 sysutils/burp/patches/patch-src_server.c diff --git a/sysutils/burp/patches/patch-src-xattr.c b/sysutils/burp/patches/patch-src-xattr.c deleted file mode 100644 index 03f0628b9eede..0000000000000 --- a/sysutils/burp/patches/patch-src-xattr.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src-xattr.c,v 1.1 2015/09/23 12:03:48 joerg Exp $ - ---- src/xattr.c.orig 2015-07-01 11:45:08.000000000 +0000 -+++ src/xattr.c -@@ -265,12 +265,19 @@ int set_xattr(const char *path, struct s - || defined(HAVE_OPENBSD_OS) - - #include -+#if defined(HAVE_FREEBSD_OS) - #include -+#else -+#include -+#endif - - static int namespaces[2] = { EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM }; - - #if defined(HAVE_FREEBSD_OS) - static const char *acl_skiplist[2] = { "system.posix1e.acl_access", NULL }; -+#else -+static const char *acl_skiplist[] = { NULL }; -+ - #endif - - int has_xattr(const char *path, char cmd) diff --git a/sysutils/burp/patches/patch-src_handy.c b/sysutils/burp/patches/patch-src_handy.c deleted file mode 100644 index 992c73866e16a..0000000000000 --- a/sysutils/burp/patches/patch-src_handy.c +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-src_handy.c,v 1.1 2020/03/29 01:02:12 joerg Exp $ - ---- src/handy.c.orig 2020-03-29 00:41:21.500961186 +0000 -+++ src/handy.c -@@ -279,18 +279,17 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, c - // compilation warnings on Macs. - unsigned char enc_iv[]={'[', 'l', 'k', 'd', '.', '$', 'G', 0xa3, '\0'}; - -- if(!(ctx=(EVP_CIPHER_CTX *)malloc(sizeof(EVP_CIPHER_CTX)))) -+ if(!(ctx=EVP_CIPHER_CTX_new())) - { - log_out_of_memory(__FUNCTION__); - return NULL; - } -- memset(ctx, 0, sizeof(EVP_CIPHER_CTX)); - // Don't set key or IV because we will modify the parameters. - EVP_CIPHER_CTX_init(ctx); - if(!(EVP_CipherInit_ex(ctx, EVP_bf_cbc(), NULL, NULL, NULL, encrypt))) - { - logp("EVP_CipherInit_ex failed\n"); -- free(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return NULL; - } - EVP_CIPHER_CTX_set_key_length(ctx, strlen(encryption_password)); -@@ -301,7 +300,7 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, c - enc_iv, encrypt)) - { - logp("Second EVP_CipherInit_ex failed\n"); -- free(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return NULL; - } - return ctx; -@@ -591,8 +590,7 @@ cleanup: - - if(enc_ctx) - { -- EVP_CIPHER_CTX_cleanup(enc_ctx); -- free(enc_ctx); -+ EVP_CIPHER_CTX_free(enc_ctx); - } - - if(!ret) diff --git a/sysutils/burp/patches/patch-src_msg.c b/sysutils/burp/patches/patch-src_msg.c deleted file mode 100644 index 1a7001a086b86..0000000000000 --- a/sysutils/burp/patches/patch-src_msg.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_msg.c,v 1.1 2020/03/29 01:02:12 joerg Exp $ - ---- src/msg.c.orig 2020-03-29 00:42:58.268427372 +0000 -+++ src/msg.c -@@ -235,8 +235,7 @@ int transfer_gzfile_in(struct sbuf *sb, - { - if(enc_ctx) - { -- EVP_CIPHER_CTX_cleanup(enc_ctx); -- free(enc_ctx); -+ EVP_CIPHER_CTX_free(enc_ctx); - } - inflateEnd(&zstrm); - return -1; -@@ -369,8 +368,7 @@ int transfer_gzfile_in(struct sbuf *sb, - inflateEnd(&zstrm); - if(enc_ctx) - { -- EVP_CIPHER_CTX_cleanup(enc_ctx); -- free(enc_ctx); -+ EVP_CIPHER_CTX_free(enc_ctx); - } - - if(ret) logp("transfer file returning: %d\n", ret); diff --git a/sysutils/burp/patches/patch-src_server.c b/sysutils/burp/patches/patch-src_server.c deleted file mode 100644 index 340157972d57e..0000000000000 --- a/sysutils/burp/patches/patch-src_server.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_server.c,v 1.1 2016/12/17 14:21:27 joerg Exp $ - -Check pointer for Non-NULL-ness, not for positivity. - ---- src/server.c.orig 2016-12-15 17:48:47.698862968 +0000 -+++ src/server.c -@@ -543,7 +543,7 @@ static int do_backup_server(const char * - working, current, currentdata, - finishing, cconf, client, - p1cntr, cntr); -- if(!ret && cconf->keep>0) -+ if(!ret && cconf->keep) - ret=remove_old_backups(basedir, cconf, client); - } -