Date: Sun, 31 Dec 2017 12:57:29 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457688 - in head/security/pulledpork: . files Message-ID: <201712311257.vBVCvTYd035067@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Dec 31 12:57:29 2017 New Revision: 457688 URL: https://svnweb.freebsd.org/changeset/ports/457688 Log: - update to 0.7.3 Modified: head/security/pulledpork/Makefile head/security/pulledpork/distinfo head/security/pulledpork/files/patch-pulledpork.pl Modified: head/security/pulledpork/Makefile ============================================================================== --- head/security/pulledpork/Makefile Sun Dec 31 12:54:41 2017 (r457687) +++ head/security/pulledpork/Makefile Sun Dec 31 12:57:29 2017 (r457688) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= pulledpork -PORTVERSION= 0.7.2 +PORTVERSION= 0.7.3 +DISTVERSIONPREFIX= v CATEGORIES= security MASTER_SITES= GHL Modified: head/security/pulledpork/distinfo ============================================================================== --- head/security/pulledpork/distinfo Sun Dec 31 12:54:41 2017 (r457687) +++ head/security/pulledpork/distinfo Sun Dec 31 12:57:29 2017 (r457688) @@ -1,3 +1,3 @@ -TIMESTAMP = 1478665576 -SHA256 (shirkdog-pulledpork-0.7.2_GH0.tar.gz) = 50046477d5d1a18aec131a56bd3f21170057d8a31fd6f30af706e31d5b14bd0a -SIZE (shirkdog-pulledpork-0.7.2_GH0.tar.gz) = 41740 +TIMESTAMP = 1512908815 +SHA256 (shirkdog-pulledpork-v0.7.3_GH0.tar.gz) = 48c66dc9abb7545186d4fba497263c1d1b247c0ea7f0953db4d515e7898461a2 +SIZE (shirkdog-pulledpork-v0.7.3_GH0.tar.gz) = 43167 Modified: head/security/pulledpork/files/patch-pulledpork.pl ============================================================================== --- head/security/pulledpork/files/patch-pulledpork.pl Sun Dec 31 12:54:41 2017 (r457687) +++ head/security/pulledpork/files/patch-pulledpork.pl Sun Dec 31 12:57:29 2017 (r457688) @@ -1,22 +1,28 @@ ---- pulledpork.pl.orig 2015-12-16 18:01:13 UTC +--- pulledpork.pl.orig 2017-12-07 15:13:06 UTC +++ pulledpork.pl -@@ -61,8 +61,8 @@ if ($oSystem =~ /freebsd/i) { - exit(1); +@@ -90,9 +90,24 @@ if ($oSystem =~ /freebsd/i) { + exit(1); } - #Check for the other location for the cert file -- } elsif ( -e "/usr/local/etc/ssl/cert.pem" ) { -- $CAFile = "/usr/local/etc/ssl/cert.pem"; -+ } elsif ( -e "/usr/local/share/certs/ca-root-nss.crt" ) { -+ $CAFile = "/usr/local/share/certs/ca-root-nss.crt"; - if ( -r $CAFile) { - $ua->ssl_opts( SSL_ca_file => $CAFile ); - } else { -@@ -72,7 +72,7 @@ if ($oSystem =~ /freebsd/i) { - exit(1); - } - } else { -- carp "ERROR: cert file does not exist (/etc/ssl/cert.pem or /usr/local/etc/ssl/cert.pem) Ensure that the ca_root_nss port/pkg is installed, or use -w to skip SSL verification\n"; -+ carp "ERROR: cert file does not exist (/etc/ssl/cert.pem or /usr/local/share/certs/ca-root-nss.crt) Ensure that the ca_root_nss port/pkg is installed, or use -w to skip SSL verification\n"; - syslogit( 'err|local0', "FATAL: cert file does not exist. Ensure that the ca_root_nss port/pkg is installed, or use -w to skip SSL verification\n") - if $Syslogging; - exit(1); + } ++ elsif (-e "/usr/local/share/certs/ca-root-nss.crt") { ++ $CAFile = "/usr/local/share/certs/ca-root-nss.crt"; ++ if (-r $CAFile) { ++ $ua->ssl_opts(SSL_ca_file => $CAFile); ++ } ++ else { ++ carp "ERROR: $CAFile is not readable by " ++ . (getpwuid($<))[0] . "\n"; ++ syslogit('err|local0', ++ "FATAL: ERROR: $CAFile is not readable by " ++ . (getpwuid($<))[0] . "\n") ++ if $Syslogging; ++ exit(1); ++ } ++ } + else { + carp +- "ERROR: cert file does not exist (/etc/ssl/cert.pem or /usr/local/etc/ssl/cert.pem) Ensure that the ca_root_nss port/pkg is installed, or use -w to skip SSL verification\n"; ++ "ERROR: cert file does not exist (/etc/ssl/cert.pem, /usr/local/etc/ssl/cert.pem or /usr/local/share/certs/ca-root-nss.crt) Ensure that the ca_root_nss port/pkg is installed, or use -w to skip SSL verification\n"; + syslogit('err|local0', + "FATAL: cert file does not exist. Ensure that the ca_root_nss port/pkg is installed, or use -w to skip SSL verification\n" + ) if $Syslogging;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712311257.vBVCvTYd035067>