NetBSD Problem Report #51975

From www@NetBSD.org  Fri Feb 17 11:41:07 2017
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id D61B87A26E
	for <gnats-bugs@gnats.NetBSD.org>; Fri, 17 Feb 2017 11:41:07 +0000 (UTC)
Message-Id: <20170217114106.27B0D7A291@mollari.NetBSD.org>
Date: Fri, 17 Feb 2017 11:41:06 +0000 (UTC)
From: org.netbsd@pooryorick.com
Reply-To: org.netbsd@pooryorick.com
To: gnats-bugs@NetBSD.org
Subject: update zziplib to 0.13.62
X-Send-Pr-Version: www-1.0

>Number:         51975
>Category:       pkg
>Synopsis:       update zziplib to 0.13.62
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    leot
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 17 11:45:00 +0000 2017
>Closed-Date:    Mon May 15 09:03:57 +0000 2017
>Last-Modified:  Mon May 15 09:03:57 +0000 2017
>Originator:     Poor Yorick
>Release:        2016Q4
>Organization:
>Environment:
>Description:
update zziplib to 0.13.62
>How-To-Repeat:

>Fix:
diff -Nbur zziplib.orig/distinfo zziplib/distinfo
--- zziplib.orig/distinfo	2017-02-12 17:35:57.000028000 -0500
+++ zziplib/distinfo	2017-02-17 06:19:44.000044000 -0500
@@ -1,16 +1,9 @@
-$NetBSD: distinfo,v 1.12 2015/12/08 11:13:04 jperkin Exp $
+$NetBSD$

-SHA1 (zziplib-0.13.59.tar.bz2) = ddbce25cb36c3b4c2b892e2c8a88fa4a0be29a71
-RMD160 (zziplib-0.13.59.tar.bz2) = b96f547039ac005f6e9ca2cf92c388a077b9b21e
-SHA512 (zziplib-0.13.59.tar.bz2) = e417867abd2a35a896c0e04d06a841db3569923fea1fbbb5de615d3357d708cdf5b085c4391b14a0943d8c574100b50c3d0de1f827090ee442fb5bf4010e3c53
-Size (zziplib-0.13.59.tar.bz2) = 691000 bytes
-SHA512 (zziplib-0.13.62.tar.bz2) = fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
-sha256 (zziplib-0.13.62.tar.bz2) = a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b
-sha1 (zziplib-0.13.62.tar.bz2) = cf8b642abd9db618324a1b98cc71492a007cd687
+SHA1 (zziplib-0.13.62.tar.bz2) = cf8b642abd9db618324a1b98cc71492a007cd687
 RMD160 (zziplib-0.13.62.tar.bz2) = f616e17d874175b628f3955c7bb9501490dd00aa
+SHA512 (zziplib-0.13.62.tar.bz2) = fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
 Size (zziplib-0.13.62.tar.bz2) = 685770 bytes
-
-SHA1 (patch-aa) = e5687abbc3bbffa2b461f6e835baa18090e2c3a8
-SHA1 (patch-ba) = 1f680820112114534318ad46603992b16e183866
-SHA1 (patch-bb) = afdcf01c5aea03f7bfd61492acbe4f3743d50b0a
-SHA1 (patch-bc) = 897a79994d90124972afdb9fa803e82520e6ae0e
+SHA1 (patch-ba) = 04eca1aac100a0b84184d86966a6f8cb56a05066
+SHA1 (patch-bb) = aa8ba9f35cdbedd44bdb9af82ddc5b6751bd6855
+SHA1 (patch-bc) = c1fd08e50e40d4aee3d0dda613763f80f52613af
diff -Nbur zziplib.orig/patches/patch-aa zziplib/patches/patch-aa
--- zziplib.orig/patches/patch-aa	2015-12-08 06:13:04.000000000 -0500
+++ zziplib/patches/patch-aa	1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2015/12/08 11:13:04 jperkin Exp $
-
---- zzip/Makefile.in.orig	2010-03-29 19:40:50.000000000 +0000
-+++ zzip/Makefile.in
-@@ -775,6 +775,7 @@ install-data-hook : install-zzipHEADERS
- 	$(DESTDIR)$(includedir)/zzip.h >$(DESTDIR)$(includedir)/zzip-io.h
- 
- install-exec-hook:
-+xxx:
- 	@ for i in . $(DESTDIR)$(libdir)/libzzip*.so.13 \
-         ; do test -d $$i && continue ; lib=`basename "$$i" .so.13` \
-         ; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.10" \
diff -Nbur zziplib.orig/patches/patch-ba zziplib/patches/patch-ba
--- zziplib.orig/patches/patch-ba	2015-12-08 06:13:04.000000000 -0500
+++ zziplib/patches/patch-ba	2017-02-17 06:08:20.000181000 -0500
@@ -2,19 +2,10 @@

 Use $as_echo to support escape sequences correctly.

---- configure.orig	2010-03-29 19:24:41.000000000 +0000
+--- configure.orig	2012-03-11 20:28:52.000000000 +0000
 +++ configure
-@@ -16257,7 +16257,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking link options" >&5
- $as_echo_n "checking link options... " >&6; }
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
- RESOLVES=" # "
- case "$host_os" in mingw*)
-     ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
-@@ -20218,24 +20220,24 @@ else
-   { $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
+@@ -17373,24 +17373,24 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
  $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
    if test -f $ac_prefix_conf_INP ; then
 -    echo "s/^#undef  *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
@@ -51,45 +42,5 @@
 +    $as_echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
 +    $as_echo "#endif" >>$tmp/pconfig.h
      if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
-       { $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
- $as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
-@@ -20352,24 +20354,24 @@ else
-   { $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
- $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
-   if test -f $ac_prefix_conf_INP ; then
--    echo "s/^#undef  *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
--    echo "s/^#undef  *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
--    echo "s/^#define  *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
--    echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
--    echo "#endif/" >>conftest.prefix
--    echo "s/^#define  *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
--    echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
--    echo "#endif/" >> conftest.prefix
-+    $as_echo "s/^#undef  *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
-+    $as_echo "s/^#undef  *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
-+    $as_echo "s/^#define  *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
-+    $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
-+    $as_echo "#endif/" >>conftest.prefix
-+    $as_echo "s/^#define  *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
-+    $as_echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
-+    $as_echo "#endif/" >> conftest.prefix
-     # now executing _script on _DEF input to create _OUT output file
--    echo "#ifndef $ac_prefix_conf_DEF"      >$tmp/pconfig.h
--    echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
--    echo ' ' >>$tmp/pconfig.h
--    echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
-+    $as_echo "#ifndef $ac_prefix_conf_DEF"      >$tmp/pconfig.h
-+    $as_echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
-+    $as_echo ' ' >>$tmp/pconfig.h
-+    $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
- 
-     sed -f conftest.prefix $ac_prefix_conf_INP >>$tmp/pconfig.h
--    echo ' ' >>$tmp/pconfig.h
--    echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
--    echo "#endif" >>$tmp/pconfig.h
-+    $as_echo ' ' >>$tmp/pconfig.h
-+    $as_echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
-+    $as_echo "#endif" >>$tmp/pconfig.h
-     if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
-       { $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_prefix_conf_OUT is unchanged" >&5
  $as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
diff -Nbur zziplib.orig/patches/patch-bb zziplib/patches/patch-bb
--- zziplib.orig/patches/patch-bb	2010-05-15 02:37:03.000000000 -0400
+++ zziplib/patches/patch-bb	2017-02-17 06:08:20.000125000 -0500
@@ -1,13 +1,18 @@
 $NetBSD: patch-bb,v 1.3 2010/05/15 06:37:03 adam Exp $

---- configure.ac.orig	2010-03-29 19:24:17.000000000 +0000
+--- configure.ac.orig	2012-03-11 20:28:35.000000000 +0000
 +++ configure.ac
-@@ -279,7 +279,7 @@ AC_SUBST(ZIPTESTS)
- # ---------------------------------------------------------------
- AC_MSG_CHECKING([link options])
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+@@ -302,11 +302,8 @@ case "$host_os" in mingw*)
  RESOLVES=" # "
- case "$host_os" in mingw*)
-     ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
+ ;; *)
+     if test ".$can_build_shared" != ".no" ; then
+-      ZZIPLIB_LDFLAGS="-export-dynamic"
+-      if test ".$lt_cv_prog_gnu_ld" == ".yes" ; then
+-         ZZIPLIB_LDFLAGS="${wl}--export-dynamic"
+-         # TODO: that is for backward compatibility only
+-      fi
++      
++      ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+     fi
+     RESOLVES=" # "
+ ;; esac
Binary files zziplib.orig/patches/.patch-bb.swp and zziplib/patches/.patch-bb.swp differ
diff -Nbur zziplib.orig/patches/patch-bc zziplib/patches/patch-bc
--- zziplib.orig/patches/patch-bc	2015-12-08 06:13:04.000000000 -0500
+++ zziplib/patches/patch-bc	2017-02-17 06:08:20.000244000 -0500
@@ -5,12 +5,12 @@

 --- m4/libtool.m4.orig	2009-08-23 11:38:19.000000000 +0000
 +++ m4/libtool.m4
-@@ -5947,7 +5947,7 @@ if test "$_lt_caught_CXX_error" != yes;
- 	  xl*)
- 	    # IBM XL 8.0 on PPC, with GNU ld
+@@ -4258,7 +4258,7 @@ dnl Note also adjust exclude_expsyms for
+     # here allows them to be overridden if necessary.
+     runpath_var=LD_RUN_PATH
  	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 -	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 +	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${EXPORT_SYMBOLS_LDFLAGS}'
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	    if test "x$supports_anon_versioning" = xyes; then
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+     # ancient GNU ld didn't support --whole-archive et. al.
+     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+       _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->leot
Responsible-Changed-By: leot@NetBSD.org
Responsible-Changed-When: Sun, 26 Feb 2017 22:22:54 +0000
Responsible-Changed-Why:
Take


State-Changed-From-To: open->analyzed
State-Changed-By: leot@NetBSD.org
State-Changed-When: Sun, 26 Feb 2017 22:22:54 +0000
State-Changed-Why:
Patch analyzed, missing a diff to Makefile (probably trivial) but
patches/patch-aa is probably still needed.


State-Changed-From-To: analyzed->feedback
State-Changed-By: leot@NetBSD.org
State-Changed-When: Sun, 26 Feb 2017 22:33:00 +0000
State-Changed-Why:
Some questions asked


From: Leonardo Taccari <leot@NetBSD.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/51975: update zziplib to 0.13.62
Date: Sun, 26 Feb 2017 23:31:36 +0100

 Hello Poor Yorick,

 org.netbsd@pooryorick.com writes:
 > >Number:         51975
 > >Category:       pkg
 > >Synopsis:       update zziplib to 0.13.62
 > >Confidential:   no
 > >Severity:       non-critical
 > >Priority:       low
 > >Responsible:    pkg-manager
 > >State:          open
 > >Class:          change-request
 > >Submitter-Id:   net
 > >Arrival-Date:   Fri Feb 17 11:45:00 +0000 2017
 > >Originator:     Poor Yorick
 > >Release:        2016Q4
 > >Organization:
 > >Environment:
 > >Description:
 > update zziplib to 0.13.62
 > >How-To-Repeat:
 > [...]

 First of all thank you for the patches and sorry for the delay in
 handling them!

 I have analyzed them and they're more or less ready!
 I have some questions/requests though:

  - Why patches/patch-aa was removed? (seems still needed)
  - A diff to archivers/zziplib/Makefile is missing. Was it just a
    DISTNAME bump or was there anything else too?

 The diff seems also not apply cleanly to pkgsrc-current. Can you
 please adjust it so it will cleanly apply to pkgsrc-current?

 And, while here (only for extra karma points! :)) can you please
 also provide a possible changelog?


 Thank you!

State-Changed-From-To: feedback->closed
State-Changed-By: leot@NetBSD.org
State-Changed-When: Mon, 15 May 2017 09:03:57 +0000
State-Changed-Why:
<spz> committed it via:
 cvs rdiff -u -r1.19 -r1.20 pkgsrc/archivers/zziplib/Makefile
 cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/zziplib/PLIST
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/zziplib/distinfo
 cvs rdiff -u -r1.5 -r1.6 pkgsrc/archivers/zziplib/patches/patch-aa
 cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/zziplib/patches/patch-ba
 cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/zziplib/patches/patch-bb
 cvs rdiff -u -r1.1 -r0 pkgsrc/archivers/zziplib/patches/patch-zzip_zip.c

Thank you for the PR and thanks to <spz> and <wiz> for
fixing it!


>Unformatted:

Home	PR Database Search