ports/155883: [patch] port security/ipsec-tools: Upgrade to 0.7.1
VANHULLEBUS Yvan
yvan.vanhullebus at netasq.com
Wed Mar 23 09:20:03 UTC 2011
Note: There was a bad value `no=20' for the field `>Confidential:'.
It was set to the default value of `yes'.
>Number: 155883
>Category: ports
>Synopsis: [patch] port security/ipsec-tools: Upgrade to 0.8.0
>Confidential: yes
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 23 09:20:02 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: VANHULLEBUS Yvan
>Release: FreeBSD 9.0-CURRENT i386
>Organization:
NETASQ
>Environment:
System: FreeBSD hoth.netasq.com 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r219862:=
Tue Mar 22 07:57:45 CET 2011 root at hoth.netasq.com:/usr/obj/home/SVN/Fr=
eeBSD/HEAD/src/sys/GENERIC i386
>Description:
Version 0.8.0 of ipsec-tools is out, which includes lots of fixes,
ehancements, features, and clean support for NAT-T PFKey API.
It also supports utmpx.h to compile on FreeBSD HEAD (specific patch
included in port for older versions of FreeBSD).
Note: files/patch-configure is now obsolete.
>How-To-Repeat:
=09
>Fix:
diff -burpN ipsec-tools/distinfo ipsec-tools/distinfo
--- ipsec-tools/distinfo 2009-08-26 18:37:22.000000000 +0200
+++ ipsec-tools/distinfo 2011-03-18 16:09:29.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (ipsec-tools-0.7.3.tar.bz2) =3D 821bd84e8d4ad5a93bf594b8b3d66e1e
-SHA256 (ipsec-tools-0.7.3.tar.bz2) =3D e6131d010b71d984194eb28267e6c01b497=
84a17a077bbafae58063f10b33b67
-SIZE (ipsec-tools-0.7.3.tar.bz2) =3D 776096
+MD5 (ipsec-tools-0.8.0.tar.bz2) =3D b79aae3055a51f8de5c0f1b8ca6cf619
+SHA256 (ipsec-tools-0.8.0.tar.bz2) =3D 2359a24aa8eda9ca7043fc47950c8e6b7f5=
8a07c5d5ad316aa7de2bc5e3a8717
+SIZE (ipsec-tools-0.8.0.tar.bz2) =3D 809297
diff -burpN ipsec-tools/files/patch8-utmp.diff ipsec-tools/files/patch8-utm=
p.diff
--- ipsec-tools/files/patch8-utmp.diff 1970-01-01 01:00:00.000000000 +0100
+++ ipsec-tools/files/patch8-utmp.diff 2010-09-21 16:17:11.000000000 +0200
@@ -0,0 +1,75 @@
+Index: src/racoon/isakmp_cfg.c
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c,v
+retrieving revision 1.24
+retrieving revision 1.23
+diff -u -p -r1.24 -r1.23
+--- src/racoon/isakmp_cfg.c 21 Sep 2010 13:14:17 -0000 1.24
++++ src/racoon/isakmp_cfg.c 4 Aug 2010 09:16:58 -0000 1.23
+@@ -38,7 +38,7 @@
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+=20
+-#include <utmpx.h>
++#include <utmp.h>
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <util.h>
+ #endif
+@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr
+ int inout;
+ {
+ int error =3D 0;
+- struct utmpx ut;
++ struct utmp ut;
++ char term[UT_LINESIZE];
+ char addr[NI_MAXHOST];
+ =09
+ if (usr =3D=3D NULL || usr[0]=3D=3D'\0') {
+@@ -1670,33 +1671,36 @@ isakmp_cfg_accounting_system(port, raddr
+ return -1;
+ }
+=20
+- memset(&ut, 0, sizeof ut);
+- gettimeofday((struct timeval *)&ut.ut_tv, NULL);
+- snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port);
++ sprintf(term, TERMSPEC, port);
+=20
+ switch (inout) {
+ case ISAKMP_CFG_LOGIN:
+- ut.ut_type =3D USER_PROCESS;
+- strncpy(ut.ut_user, usr, sizeof ut.ut_user);
++ strncpy(ut.ut_name, usr, UT_NAMESIZE);
++ ut.ut_name[UT_NAMESIZE - 1] =3D '\0';
++
++ strncpy(ut.ut_line, term, UT_LINESIZE);
++ ut.ut_line[UT_LINESIZE - 1] =3D '\0';
+=20
+ GETNAMEINFO_NULL(raddr, addr);
+- strncpy(ut.ut_host, addr, sizeof ut.ut_host);
++ strncpy(ut.ut_host, addr, UT_HOSTSIZE);
++ ut.ut_host[UT_HOSTSIZE - 1] =3D '\0';
+=20
++ ut.ut_time =3D time(NULL);
++=20
+ plog(LLV_INFO, LOCATION, NULL,
+ "Accounting : '%s' logging on '%s' from %s.\n",
+- ut.ut_user, ut.ut_id, addr);
++ ut.ut_name, ut.ut_line, ut.ut_host);
+=20
+- pututxline(&ut);
++ login(&ut);
+=20
+ break;
+ case ISAKMP_CFG_LOGOUT:=09
+- ut.ut_type =3D DEAD_PROCESS;
+=20
+ plog(LLV_INFO, LOCATION, NULL,
+ "Accounting : '%s' unlogging from '%s'.\n",
+- usr, ut.ut_id);
++ usr, term);
+=20
+- pututxline(&ut);
++ logout(term);
+=20
+ break;
+ default:
diff -burpN ipsec-tools/files/racoon.sh.in ipsec-tools/files/racoon.sh.in
--- ipsec-tools/files/racoon.sh.in 2010-03-27 01:14:44.000000000 +0100
+++ ipsec-tools/files/racoon.sh.in 2010-04-21 11:15:31.000000000 +0200
@@ -20,7 +20,7 @@
racoon_create_dirs=3DNO # Create $required_dirs (for
# /var mfs)?
=20
-. /etc/rc.subr
+. %%RC_SUBR%%
=20
name=3D"racoon"
rcvar=3D`set_rcvar`
diff -burpN ipsec-tools/Makefile ipsec-tools/Makefile
--- ipsec-tools/Makefile 2010-12-04 08:33:25.000000000 +0100
+++ ipsec-tools/Makefile 2011-03-22 18:01:39.000000000 +0100
@@ -10,7 +10,7 @@
# - $LOCALBASE/sbin/setkey Vs /usr/sbin/setkey
=20
PORTNAME=3D ipsec-tools
-PORTVERSION=3D 0.7.3
+PORTVERSION=3D 0.8.0
CATEGORIES=3D security
MASTER_SITES=3D SF
=20
@@ -59,8 +59,8 @@ PORTDOCS=3D *
=20
.include <bsd.port.pre.mk>
=20
-.if ${OSVERSION} > 900007
-BROKEN=3D fails to build with new utmpx
+.if ${OSVERSION} < 900007
+EXTRA_PATCHES=3Dfiles/patch8-utmp.diff
.endif
=20
.ifdef(WITH_DEBUG)
@@ -161,16 +161,18 @@ CONFIGURE_ARGS+=3D --enable-idea
CONFIGURE_ARGS+=3D --disable-idea
.endif
=20
+.if ${OSVERSION} < 800000
.ifdef(WITH_NATT)
pre-configure:
@${ECHO_MSG} "=3D=3D=3D> ------------------------------------------------=
-------------------------"
@${ECHO_MSG} "=3D=3D=3D> ATTENTION: You need a kernel patch to enable NAT=
-Traversal functionality!"
- @${ECHO_MSG} "=3D=3D=3D> You can download the patch here:"
- @${ECHO_MSG} "=3D=3D=3D> http://ipsec-tools.sf.net/freebsd6-natt.diff=
"
+ @${ECHO_MSG} "=3D=3D=3D> latest known patch for FreeBSD 7 is available he=
re:"
+ @${ECHO_MSG} "=3D=3D=3D> http://people.freebsd.org/~bz/20110123-01-st=
able7-natt.diff"
@${ECHO_MSG} "=3D=3D=3D> You might possibly have to do some steps manuall=
y if it fails to apply."
@${ECHO_MSG} "=3D=3D=3D> ------------------------------------------------=
-------------------------"
@sleep 3
.endif
+.endif
=20
post-install:
@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && ${ECHO_CMD} ipsec` ]; the=
n \
--=-TtnVubOEg5FOXCF159Ni
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Disposition: attachment; filename="smime.p7s"
Content-Transfer-Encoding: base64
MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINFjCCBocw
ggVvoAMCAQICCnDGsUgWa/KQavkwDQYJKoZIhvcNAQEEBQAwgZExCzAJBgNVBAYTAkZSMQ0wCwYD
VQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNjcTEuMCwGA1UEChMlTkVUQVNRIC0g
U2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxMeTkVUQVNRIENlcnRpZmljYXRp
b24gQXV0aG9yaXR5MB4XDTA5MDcxNTE0MzU1MloXDTExMDcxNTE0MzU1MlowgdgxCzAJBgNVBAYU
AkZSMQ0wCwYDVQQIFAROb3JkMS4wLAYDVQQKFCVORVRBU1EgLSBTZWN1cmUgSW50ZXJuZXQgQ29u
bmVjdGl2aXR5MScwJQYDVQQLFB5ORVRBU1EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGjAYBgNV
BAcUEVZpbGxlbmV1dmUgZCdBc2NxMRkwFwYDVQQDFBBZdmFuIFZBTkhVTExFQlVTMSowKAYJKoZI
hvcNAQkBFht5dmFuLnZhbmh1bGxlYnVzQG5ldGFzcS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQDeMFP1mi1WbfhlnThe31TQKc1tvO8r2JCphawWJwrQ9N0EGjDglwvxgLqfolA9
srIIFktPWoCS229yvRc5DvFOljNpb32VXzr5hd18js0OG+EfpgfBDCcQT+D7FzBtpWVfHjtywebD
yJx2r7yDp1WPETbjMaMUAGAvNW+71ctlYZ6FfQxrnAj7q5PF8ttRMG5W/f2dz27sJZE0pM9cAnba
YFWUQFkhXVPiZBdbWaMRNqxNlPEFuam2mgq7j/QZDyNNIQ2XLgMMA+sKHhtTftq0Y5DfmWGHpF8U
4ag499c9V4AuTDx1cNrX46UN1u/XmSfmk78a0Qu9JCf0So5z0EplAgMBAAGjggKWMIICkjAMBgNV
HRMBAf8EAjAAMB0GA1UdDgQWBBR95Uv9h1xpEXgt2KVjl3HvVGe6aDCBvgYDVR0jBIG2MIGzgBQn
Kusd2UTaOhdzagkgIMklqPl/sqGBl6SBlDCBkTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBE5vcmQx
GjAYBgNVBAcTEVZpbGxlbmV1dmUgZCdBc2NxMS4wLAYDVQQKEyVORVRBU1EgLSBTZWN1cmUgSW50
ZXJuZXQgQ29ubmVjdGl2aXR5MScwJQYDVQQLEx5ORVRBU1EgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
dHmCAQAwDgYDVR0PAQH/BAQDAgXgMBEGCWCGSAGG+EIBAQQEAwIFoDArBgkrBgEEAYI3FAIEHh4c
AFMAbQBhAHIAdABjAGEAcgBkAEwAbwBnAG8AbjApBgNVHSUEIjAgBggrBgEFBQcDBAYIKwYBBQUH
AwIGCisGAQQBgjcUAgIwNgYDVR0RBC8wLaArBgorBgEEAYI3FAIDoB0MG3l2YW4udmFuaHVsbGVi
dXNAbmV0YXNxLmNvbTCBzQYDVR0fBIHFMIHCMFqgWKBWhlRsZGFwOi8vcGtpLm5ldGFzcS5jb20v
Y249ZndjYSxvdT1jYXMsbz1uZXRhc3EsZGM9ZnI/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDti
aW5hcnkwOKA2oDSGMmh0dHA6Ly9pbnRyYW5ldC5uZXRhc3EuY29tL2ludHJhbmV0L3BraS9uZXRh
c3EuY3JsMCqgKKAmhiRodHRwOi8vd3d3Lm5ldGFzcS5jb20vcGtpL25ldGFzcS5jcmwwHwYJYIZI
AYb4QgENBBIWEFVzZXIgQ2VydGlmaWNhdGUwDQYJKoZIhvcNAQEEBQADggEBAAwxYaw1sirXCn7U
3w+8NrJeFMvKr01f5HVhZSHP0I7dQ5id8hKtBVqcJHM6Wfg45NYYcPPHe9rEKavHKb+2H1boerF/
aMICgrbkcG3o0XsjIUJoRIdMRZG7dmJFH94Feg/GZh9ta/Lsn1WQ2QBJwdVryTlUqN/q6tq0oOeJ
zz55bSQsyMWUHSTLPVLmOqYy+H+fdGrd+BLMugJP/BemlQlmYGhRpdQ+AXTvjkfdpdz53r4kOdVE
fhE0ylSEi0mFTm44GOekK2AcaIixuKl4ct8VfWENdRb/NFMDQCUw4TiQ9OBYzxm8oPzD8DUhov/j
ghJEUgoUK9yRND/EOZ5eYr8wggaHMIIFb6ADAgECAgpwxrFIFmvykGr5MA0GCSqGSIb3DQEBBAUA
MIGRMQswCQYDVQQGEwJGUjENMAsGA1UECBMETm9yZDEaMBgGA1UEBxMRVmlsbGVuZXV2ZSBkJ0Fz
Y3ExLjAsBgNVBAoTJU5FVEFTUSAtIFNlY3VyZSBJbnRlcm5ldCBDb25uZWN0aXZpdHkxJzAlBgNV
BAsTHk5FVEFTUSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wOTA3MTUxNDM1NTJaFw0xMTA3
MTUxNDM1NTJaMIHYMQswCQYDVQQGFAJGUjENMAsGA1UECBQETm9yZDEuMCwGA1UEChQlTkVUQVNR
IC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxQeTkVUQVNRIENlcnRpZmlj
YXRpb24gQXV0aG9yaXR5MRowGAYDVQQHFBFWaWxsZW5ldXZlIGQnQXNjcTEZMBcGA1UEAxQQWXZh
biBWQU5IVUxMRUJVUzEqMCgGCSqGSIb3DQEJARYbeXZhbi52YW5odWxsZWJ1c0BuZXRhc3EuY29t
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3jBT9ZotVm34ZZ04Xt9U0CnNbbzvK9iQ
qYWsFicK0PTdBBow4JcL8YC6n6JQPbKyCBZLT1qAkttvcr0XOQ7xTpYzaW99lV86+YXdfI7NDhvh
H6YHwQwnEE/g+xcwbaVlXx47csHmw8icdq+8g6dVjxE24zGjFABgLzVvu9XLZWGehX0Ma5wI+6uT
xfLbUTBuVv39nc9u7CWRNKTPXAJ22mBVlEBZIV1T4mQXW1mjETasTZTxBbmptpoKu4/0GQ8jTSEN
ly4DDAPrCh4bU37atGOQ35lhh6RfFOGoOPfXPVeALkw8dXDa1+OlDdbv15kn5pO/GtELvSQn9EqO
c9BKZQIDAQABo4ICljCCApIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUfeVL/YdcaRF4LdilY5dx
71Rnumgwgb4GA1UdIwSBtjCBs4AUJyrrHdlE2joXc2oJICDJJaj5f7KhgZekgZQwgZExCzAJBgNV
BAYTAkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNjcTEuMCwGA1UE
ChMlTkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxMeTkVUQVNR
IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMA4GA1UdDwEB/wQEAwIF4DARBglghkgBhvhCAQEE
BAMCBaAwKwYJKwYBBAGCNxQCBB4eHABTAG0AYQByAHQAYwBhAHIAZABMAG8AZwBvAG4wKQYDVR0l
BCIwIAYIKwYBBQUHAwQGCCsGAQUFBwMCBgorBgEEAYI3FAICMDYGA1UdEQQvMC2gKwYKKwYBBAGC
NxQCA6AdDBt5dmFuLnZhbmh1bGxlYnVzQG5ldGFzcS5jb20wgc0GA1UdHwSBxTCBwjBaoFigVoZU
bGRhcDovL3BraS5uZXRhc3EuY29tL2NuPWZ3Y2Esb3U9Y2FzLG89bmV0YXNxLGRjPWZyP2NlcnRp
ZmljYXRlUmV2b2NhdGlvbkxpc3Q7YmluYXJ5MDigNqA0hjJodHRwOi8vaW50cmFuZXQubmV0YXNx
LmNvbS9pbnRyYW5ldC9wa2kvbmV0YXNxLmNybDAqoCigJoYkaHR0cDovL3d3dy5uZXRhc3EuY29t
L3BraS9uZXRhc3EuY3JsMB8GCWCGSAGG+EIBDQQSFhBVc2VyIENlcnRpZmljYXRlMA0GCSqGSIb3
DQEBBAUAA4IBAQAMMWGsNbIq1wp+1N8PvDayXhTLyq9NX+R1YWUhz9CO3UOYnfISrQVanCRzOln4
OOTWGHDzx3vaxCmrxym/th9W6Hqxf2jCAoK25HBt6NF7IyFCaESHTEWRu3ZiRR/eBXoPxmYfbWvy
7J9VkNkAScHVa8k5VKjf6uratKDnic8+eW0kLMjFlB0kyz1S5jqmMvh/n3Rq3fgSzLoCT/wXppUJ
ZmBoUaXUPgF0745H3aXc+d6+JDnVRH4RNMpUhItJhU5uOBjnpCtgHGiIsbipeHLfFX1hDXUW/zRT
A0AlMOE4kPTgWM8ZvKD8w/A1IaL/44ISRFIKFCvckTQ/xDmeXmK/MYIDkzCCA48CAQEwgaAwgZEx
CzAJBgNVBAYTAkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNjcTEu
MCwGA1UEChMlTkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxMe
TkVUQVNRIENlcnRpZmljYXRpb24gQXV0aG9yaXR5AgpwxrFIFmvykGr5MAkGBSsOAwIaBQCgggHH
MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDMyMzA4NTcxN1ow
IwYJKoZIhvcNAQkEMRYEFOuj1PdzHq2u7arDzLtLt5rUtcoSMIGxBgkrBgEEAYI3EAQxgaMwgaAw
gZExCzAJBgNVBAYTAkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNj
cTEuMCwGA1UEChMlTkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UE
CxMeTkVUQVNRIENlcnRpZmljYXRpb24gQXV0aG9yaXR5AgpwxrFIFmvykGr5MIGzBgsqhkiG9w0B
CRACCzGBo6CBoDCBkTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBE5vcmQxGjAYBgNVBAcTEVZpbGxl
bmV1dmUgZCdBc2NxMS4wLAYDVQQKEyVORVRBU1EgLSBTZWN1cmUgSW50ZXJuZXQgQ29ubmVjdGl2
aXR5MScwJQYDVQQLEx5ORVRBU1EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkCCnDGsUgWa/KQavkw
DQYJKoZIhvcNAQEBBQAEggEAO6yd20EI5q1I3647UztH8if7tmygzR6AVB4qKfgDaSRnsgsIb9Ag
vr0dG9F8l9PQPVd9wNBLvbIBDP1WChd8VmIm3mbxusGMLi5TGl1bWlmo9c+4CSh735Td1KyTnQCI
ft8eJTOtI3PZTRro8tbuyPTWNDUf2S1ujVf37Q9pykEUu0gZEaIkUzB13cNq1/FEDCSqsf6/lqXb
K5rB91sDgiTJRBrIyvSwgSA9pNPXPlBaotF18bDEJ5D4gDYPdXU7nS71bKvE/rMvKxenj1g52u8a
lNES4rrtiLEDhrvvZ0a4BDCLTyaI0I16tE4PJXUoJHW3n31c8sOUJdQIunDUtgAAAAAAAA==
--=-TtnVubOEg5FOXCF159Ni--
>Release-Note:
>Audit-Trail:
>Unformatted:
--=-TtnVubOEg5FOXCF159Ni
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
More information about the freebsd-ports-bugs
mailing list