cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update wget to 1.12

Browse Source 
- regen plist
- update patch

ok ajacoutot@
This commit is contained in:
benoit 2009-10-15 08:27:04 +00:00
parent 0b5f9cbbd8
commit afea3a4b20
7 changed files with 51 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
net/wget/Makefile
View File

@ -1,26 +1,27 @@
# $OpenBSD: Makefile,v 1.47 2009/09/16 17:34:41 jasper Exp $
# $OpenBSD: Makefile,v 1.48 2009/10/15 08:27:04 benoit Exp $
COMMENT= retrieve files from the web via HTTP, HTTPS and FTP
COMMENT = retrieve files from the web via HTTP, HTTPS and FTP
DISTNAME= wget-1.11.4
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU:=wget/}
DISTNAME = wget-1.12
CATEGORIES = net
HOMEPAGE= http://www.gnu.org/software/wget/
HOMEPAGE = http://www.gnu.org/software/wget/
MODULES= devel/gettext
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto ssl
WANTLIB = c crypto ssl
CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
MODULES = devel/gettext
CONFIGURE_STYLE = gnu
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
pre-build:
@${SUBST_CMD} ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/sample.wgetrc

10
net/wget/distinfo
View File

@ -1,5 +1,5 @@
MD5 (wget-1.11.4.tar.gz) = aeinKWwOEsU72f/XhkYuhw==
RMD160 (wget-1.11.4.tar.gz) = HOyZsHP89k3TYpd7C4ilX49Hu7g=
SHA1 (wget-1.11.4.tar.gz) = p4o7cf1ZUE3z/z28CiGVoUEOnqw=
SHA256 (wget-1.11.4.tar.gz) = cxWWO27vt1MLSk9jpdXM2rMAeHhM9BzLUpeHP5reovM=
SIZE (wget-1.11.4.tar.gz) = 1475149
MD5 (wget-1.12.tar.gz) = FBRhucBORU3IkzydHyq/gw==
RMD160 (wget-1.12.tar.gz) = Iy0Kpvs2cxwWLStzdKqatZ5nG30=
SHA1 (wget-1.12.tar.gz) = UNTtJEHmfbeqUGHYpN3kHuDpQkg=
SHA256 (wget-1.12.tar.gz) = dXjtCXThLKpxEgWB+jli7lpp9xdd3D1qbbDs3LpltXI=
SIZE (wget-1.12.tar.gz) = 2464747

21
net/wget/patches/patch-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure,v 1.7 2008/10/09 18:50:45 sthen Exp $
--- configure.orig Mon Jun 30 02:41:15 2008
+++ configure Thu Oct 9 15:34:59 2008
@@ -12562,7 +12562,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12619,7 +12619,7 @@ fi
echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6; }
if test $ac_cv_lib_intl_gettext = yes; then
- LIBS="-lintl $LIBS"
+ LIBS="-lintl -liconv $LIBS"
cat >>confdefs.h <<\_ACEOF
#define HAVE_GETTEXT 1

39
net/wget/patches/patch-doc_Makefile_in
View File

@ -1,28 +1,19 @@
$OpenBSD: patch-doc_Makefile_in,v 1.3 2008/10/09 18:50:45 sthen Exp $
--- doc/Makefile.in.orig Sun Apr 27 05:48:19 2008
+++ doc/Makefile.in Thu Oct 9 15:34:59 2008
@@ -51,7 +51,7 @@ RM = rm -f
TEXI2POD = $(srcdir)/texi2pod.pl
POD2MAN = @POD2MAN@
MAN = wget.$(manext)
-WGETRC = $(sysconfdir)/wgetrc
+WGETRCDIR = $(prefix)/share/examples/wget
--- doc/Makefile.in.orig Tue Sep 22 18:40:11 2009
+++ doc/Makefile.in Thu Oct 1 14:53:44 2009
@@ -598,7 +598,7 @@
RM = rm -f
TEXI2POD = $(srcdir)/texi2pod.pl
MAN = wget.$(manext)
-WGETRC = $(sysconfdir)/wgetrc
+WGETRCDIR = $(prefix)/share/examples/wget
SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
#
@@ -66,6 +66,7 @@ $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
sed s/@/@@/g $? > $@
wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI) $(srcdir)/version.texi
+ @rm -f wget.info*
$(MAKEINFO) -I$(srcdir) $(srcdir)/wget.texi
.SECONDARY: wget.pod
@@ -128,22 +129,8 @@ install.man: $(MAN)
@@ -1067,23 +1067,9 @@
# install sample.wgetrc
install.wgetrc: $(srcdir)/sample.wgetrc
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- @if test -f $(DESTDIR)$(WGETRC); then \
- if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \
- else \
@ -38,8 +29,10 @@ $OpenBSD: patch-doc_Makefile_in,v 1.3 2008/10/09 18:50:45 sthen Exp $
- else \
- $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \
- fi
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(WGETRCDIR)
-
+ $(mkinstalldirs) $(DESTDIR)$(WGETRCDIR)
+ $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRCDIR)
# uninstall info pages
uninstall.info:
+
# uninstall man page
uninstall.man:
$(RM) $(DESTDIR)$(mandir)/man$(manext)/$(MAN)

7
net/wget/patches/patch-doc_sample_wgetrc
View File

@ -1,10 +1,9 @@
$OpenBSD: patch-doc_sample_wgetrc,v 1.3 2008/10/09 18:50:45 sthen Exp $
--- doc/sample.wgetrc.orig Thu Oct 9 15:37:14 2008
+++ doc/sample.wgetrc Thu Oct 9 15:37:32 2008
--- doc/sample.wgetrc.orig Tue Sep 22 04:53:58 2009
+++ doc/sample.wgetrc Thu Oct 1 14:41:31 2009
@@ -7,7 +7,7 @@
## not contain a comprehensive list of commands -- look at the manual
## to find out what you can put into this file.
##
##
-## Wget initialization file can reside in /usr/local/etc/wgetrc
+## Wget initialization file can reside in ${SYSCONFDIR}/wgetrc
## (global, for all users) or $HOME/.wgetrc (for a single user).

67
net/wget/patches/patch-src_openssl_c
View File

@ -1,67 +0,0 @@
$OpenBSD: patch-src_openssl_c,v 1.1 2009/09/16 17:34:41 jasper Exp $
Security fix for SA36540 (SSL Certificate NULL Character Processing
Vulnerability).
Patches from:
http://hg.addictivecode.org/wget/mainline/rev/2d8c76a23e7d
http://hg.addictivecode.org/wget/mainline/rev/f2d2ca32fd1b
--- src/openssl.c.orig Sun Apr 27 06:48:23 2008
+++ src/openssl.c Wed Sep 16 19:29:41 2009
@@ -561,9 +561,11 @@ ssl_check_certificate (int fd, const char *host)
- Ensure that ASN1 strings from the certificate are encoded as
UTF-8 which can be meaningfully compared to HOST. */
+ X509_NAME *xname = X509_get_subject_name(cert);
common_name[0] = '\0';
- X509_NAME_get_text_by_NID (X509_get_subject_name (cert),
- NID_commonName, common_name, sizeof (common_name));
+ X509_NAME_get_text_by_NID (xname, NID_commonName, common_name,
+ sizeof (common_name));
+
if (!pattern_match (common_name, host))
{
logprintf (LOG_NOTQUIET, _("\
@@ -571,6 +573,41 @@ ssl_check_certificate (int fd, const char *host)
severity, escnonprint (common_name), escnonprint (host));
success = false;
}
+ else
+ {
+ /* We now determine the length of the ASN1 string. If it differs from
+ * common_name's length, then there is a \0 before the string terminates.
+ * This can be an instance of a null-prefix attack.
+ *
+ * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike
+ * */
+
+ int i = -1, j;
+ X509_NAME_ENTRY *xentry;
+ ASN1_STRING *sdata;
+
+ if (xname) {
+ for (;;)
+ {
+ j = X509_NAME_get_index_by_NID (xname, NID_commonName, i);
+ if (j == -1) break;
+ i = j;
+ }
+ }
+
+ xentry = X509_NAME_get_entry(xname,i);
+ sdata = X509_NAME_ENTRY_get_data(xentry);
+ if (strlen (common_name) != ASN1_STRING_length (sdata))
+ {
+ logprintf (LOG_NOTQUIET, _("\
+%s: certificate common name is invalid (contains a NUL character).\n\
+This may be an indication that the host is not who it claims to be\n\
+(that is, it is not the real %s).\n"),
+ severity, escnonprint (host));
+ success = false;
+ }
+ }
+
if (success)
DEBUGP (("X509 certificate successfully verified and matches host %s\n",

10
net/wget/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2008/10/09 18:50:45 sthen Exp $
@comment $OpenBSD: PLIST,v 1.23 2009/10/15 08:27:12 benoit Exp $
@bin bin/wget
@info info/wget.info
@man man/man1/wget.1
@ -12,9 +12,14 @@ share/locale/cs/LC_MESSAGES/wget.mo
share/locale/da/LC_MESSAGES/wget.mo
share/locale/de/LC_MESSAGES/wget.mo
share/locale/el/LC_MESSAGES/wget.mo
share/locale/en@boldquot/LC_MESSAGES/wget.mo
share/locale/en@quot/LC_MESSAGES/wget.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/wget.mo
share/locale/en_US/
share/locale/en_US/LC_MESSAGES/
share/locale/en_US/LC_MESSAGES/wget.mo
share/locale/eo/LC_MESSAGES/wget.mo
share/locale/es/LC_MESSAGES/wget.mo
share/locale/et/LC_MESSAGES/wget.mo
@ -29,6 +34,9 @@ share/locale/hu/LC_MESSAGES/wget.mo
share/locale/id/LC_MESSAGES/wget.mo
share/locale/it/LC_MESSAGES/wget.mo
share/locale/ja/LC_MESSAGES/wget.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/wget.mo
share/locale/nb/LC_MESSAGES/wget.mo
share/locale/nl/LC_MESSAGES/wget.mo
share/locale/pl/LC_MESSAGES/wget.mo