pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libreswan: fix pkglint, call it 4.9nb1

Module Name:	pkgsrc-wip
Committed By:	Andrew Cagney <andrew.cagney%gmail.com@localhost>
Pushed By:	cagney
Date:		Mon Oct 17 21:15:12 2022 +0000
Changeset:	259edbfff6507618bc7382a98aa0f6e5976d48ce

Modified Files:
	libreswan/Makefile
	libreswan/PLIST
	libreswan/distinfo

Log Message:
libreswan: fix pkglint, call it 4.9nb1

as in take an initial stab at fixing /etc
use snapshot as that contains all the upstream changes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=259edbfff6507618bc7382a98aa0f6e5976d48ce

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libreswan/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++-----------
 libreswan/PLIST    | 35 ++++++++++++--------------------
 libreswan/distinfo |  6 +++---
 3 files changed, 63 insertions(+), 37 deletions(-)

diffs:
diff --git a/libreswan/Makefile b/libreswan/Makefile
index d06affe84d..5d27030971 100644
--- a/libreswan/Makefile
+++ b/libreswan/Makefile
@@ -6,10 +6,17 @@
 # specific overides in mk/default/*.mk (for instance,
 # mk/default/netbsd.mk).
 
-DISTNAME=	libreswan-4.9
-CATEGORIES=	security
-MASTER_SITES=	https://download.libreswan.org/
+#DISTNAME=	libreswan-4.9
+#MASTER_SITES=	https://download.libreswan.org/
+
+GITHUB_PROJECT=	libreswan
+DISTNAME=	libreswan
+PKGNAME=	libreswan-4.9nb1
+GITHUB_TAG=	9583cda324d23e73c806b0b0377eadebdbee1f89
+MASTER_SITES=	${MASTER_SITE_GITHUB:=${GITHUB_PROJECT}/}
+DIST_SUBDIR=	${GITHUB_PROJECT}
 
+CATEGORIES=	security
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://libreswan.org/
 # Libreswan is an ...
@@ -22,21 +29,49 @@ USE_TOOLS+=	flex
 USE_TOOLS+=	bison
 #default is: USE_LANGUAGES+=	c
 
-DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+EGDIR=		${PREFIX}/share/examples/libreswan
+
+# Config files: stop libreswan 4.10+ scribbling into /etc
+MAKE_FLAGS+=	INSTALL_CONFIGS=false
 
-# Logroate isn't required; just recommended.
-# Logroate isn't installed into examples:
-#   https://github.com/libreswan/libreswan/issues/767
-#EGDIR=		${PREFIX}/share/examples/libreswan
-#DEPENDS+=	logrotate-[0-9]*:../../sysutils/logrotate
-#CONF_FILES+=	${EGDIR}/logrotate.d/ipsec ${PKG_SYSCONFDIR}/logrotate.d/ipsec
-#MAKE_DIRS+=	${PKG_SYSCONFDIR}/logrotate.d
+# Init scripts aka rc.d: stop libreswan 4.10+ scribbing into /etc
+MAKE_FLAGS+=	INSTALL_INITSYSTEM=false
+FILESDIR=	${DESTDIR}${EGDIR}/rc.d
+post-install:
+	mv $(FILESDIR)/pluto $(FILESDIR)/pluto.sh
+#RCD_SCRIPTS=	pluto
+#CONF_FILES+=	${EGDIR}/rc.d/ipsec ${PKG_SYSCONFDIR}/rc.d/ipsec
+
+# populate /etc
+PERMS=$(REAL_ROOT_USER) $(REAL_ROOT_GROUP) 0700
+MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/ipsec.d $(PERMS)
+MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/ipsec.d/policies $(PERMS)
+CONF_FILES_PERMS+=	${EGDIR}/ipsec.secrets-sample ${PKG_SYSCONFDIR}/ipsec.secrets $(PERMS)
+CONF_FILES_PERMS+=	${EGDIR}/ipsec.conf-sample ${PKG_SYSCONFDIR}/ipsec.conf $(PERMS)
+CONF_FILES+=		${EGDIR}/ipsec.d/policies/portexcludes.conf ${PKG_SYSCONFDIR}/ipsec.d/policies/portexcludes.conf
+# needs a for loop
+CONF_FILES+=		${EGDIR}/ipsec.d/policies/block ${PKG_SYSCONFDIR}/ipsec.d/policies/block
+CONF_FILES+=		${EGDIR}/ipsec.d/policies/clear ${PKG_SYSCONFDIR}/ipsec.d/policies/clear
+CONF_FILES+=		${EGDIR}/ipsec.d/policies/clear-or-private ${PKG_SYSCONFDIR}/ipsec.d/policies/clear-or-private
+CONF_FILES+=		${EGDIR}/ipsec.d/policies/private ${PKG_SYSCONFDIR}/ipsec.d/policies/private
+CONF_FILES+=		${EGDIR}/ipsec.d/policies/private-or-clear ${PKG_SYSCONFDIR}/ipsec.d/policies/private-or-clear
+
+# Always install pam.d!?
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/pam.d
+CONF_FILES+=	${EGDIR}/pam.d/pluto ${PKG_SYSCONFDIR}/pam.d/pluto
+
+# Alway install logrotate!?!
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/logrotate.d
+CONF_FILES+=	${EGDIR}/logrotate.d/libreswan ${PKG_SYSCONFDIR}/logrotate.d/libreswan
 
 CHECK_PORTABILITY_SKIP=	mk/docker-targets.mk
 
-# code not clean enough
+# code not clean enough; XXX: why?
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
+# some stuff uses .include, some does not
+DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+
 # libevent?
 .include "../../net/unbound/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/libreswan/PLIST b/libreswan/PLIST
index b41a082681..81d1e8b899 100644
--- a/libreswan/PLIST
+++ b/libreswan/PLIST
@@ -1,19 +1,8 @@
 @comment $NetBSD$
-etc/ipsec.conf
-etc/ipsec.d/policies/block
-etc/ipsec.d/policies/clear
-etc/ipsec.d/policies/clear-or-private
-etc/ipsec.d/policies/portexcludes.conf
-etc/ipsec.d/policies/private
-etc/ipsec.d/policies/private-or-clear
-etc/ipsec.secrets
-etc/logrotate.d/libreswan
-etc/rc.d/pluto
 libexec/ipsec/_import_crl
 libexec/ipsec/_plutorun
 libexec/ipsec/_realsetup
 libexec/ipsec/_secretcensor
-libexec/ipsec/_stackmanager
 libexec/ipsec/_unbound-hook
 libexec/ipsec/_updown
 libexec/ipsec/_updown.bsd
@@ -31,18 +20,15 @@ libexec/ipsec/ipcheck
 libexec/ipsec/jambufcheck
 libexec/ipsec/keyidcheck
 libexec/ipsec/letsencrypt
-libexec/ipsec/look
 libexec/ipsec/newhostkey
 libexec/ipsec/pluto
 libexec/ipsec/readwriteconf
-libexec/ipsec/routecheck
 libexec/ipsec/rsasigkey
 libexec/ipsec/setup
-libexec/ipsec/show
 libexec/ipsec/showhostkey
+libexec/ipsec/showroute
 libexec/ipsec/timecheck
 libexec/ipsec/vendoridcheck
-libexec/ipsec/verify
 libexec/ipsec/whack
 man/man5/ipsec.conf.5
 man/man5/ipsec.secrets.5
@@ -51,7 +37,6 @@ man/man8/ipsec__import_crl.8
 man/man8/ipsec__plutorun.8
 man/man8/ipsec__realsetup.8
 man/man8/ipsec__secretcensor.8
-man/man8/ipsec__stackmanager.8
 man/man8/ipsec__unbound-hook.8
 man/man8/ipsec__updown.8
 man/man8/ipsec__updown.bsdkame.8
@@ -63,19 +48,25 @@ man/man8/ipsec_ecdsasigkey.8
 man/man8/ipsec_import.8
 man/man8/ipsec_initnss.8
 man/man8/ipsec_letsencrypt.8
-man/man8/ipsec_look.8
 man/man8/ipsec_newhostkey.8
 man/man8/ipsec_pluto.8
 man/man8/ipsec_readwriteconf.8
 man/man8/ipsec_rsasigkey.8
 man/man8/ipsec_setup.8
-man/man8/ipsec_show.8
 man/man8/ipsec_showhostkey.8
+man/man8/ipsec_showroute.8
 man/man8/ipsec_vendorid.8
-man/man8/ipsec_verify.8
 man/man8/ipsec_whack.8
 man/man8/pluto.8
 sbin/ipsec
-share/doc/libreswan/ipsec.conf-sample
-share/doc/libreswan/ipsec.secrets-sample
-share/examples/rc.d/pluto
+share/examples/libreswan/ipsec.conf-sample
+share/examples/libreswan/ipsec.d/policies/block
+share/examples/libreswan/ipsec.d/policies/clear
+share/examples/libreswan/ipsec.d/policies/clear-or-private
+share/examples/libreswan/ipsec.d/policies/portexcludes.conf
+share/examples/libreswan/ipsec.d/policies/private
+share/examples/libreswan/ipsec.d/policies/private-or-clear
+share/examples/libreswan/ipsec.secrets-sample
+share/examples/libreswan/logrotate.d/libreswan
+share/examples/libreswan/pam.d/pluto
+share/examples/libreswan/rc.d/pluto.sh
diff --git a/libreswan/distinfo b/libreswan/distinfo
index 71b0606056..caeed94065 100644
--- a/libreswan/distinfo
+++ b/libreswan/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (libreswan-4.9.tar.gz) = 996974d3d3aba26d4c21d46356769d20ac2f466ad1c6900d8e34dc514ee2692d
-SHA512 (libreswan-4.9.tar.gz) = 4a43b09b0ef1bacc64ca1b74e7c268df7f024d8b6a9633a489f373ecd9327b173e9508dbc13c4d25ee74f3e2ba569d9d38dfd851fd98cf3cde4a61ef90a1d9d5
-Size (libreswan-4.9.tar.gz) = 3706966 bytes
+BLAKE2s (libreswan/libreswan-9583cda324d23e73c806b0b0377eadebdbee1f89.tar.gz) = 65c00da66ca25370984238ca523620bec994e56b14615964d5956bb3b4bc9e14
+SHA512 (libreswan/libreswan-9583cda324d23e73c806b0b0377eadebdbee1f89.tar.gz) = 5c2a0419fd1c89a4abd5e15ad680be66fdbb55168fe22b36756fa1bdb36c3dc8b8aec2779b8071ecdb021cae1215568d0cad6f3c6d594c4dada405c81002d9d0
+Size (libreswan/libreswan-9583cda324d23e73c806b0b0377eadebdbee1f89.tar.gz) = 3694158 bytes
Home | Main Index | Thread Index | Old Index