diff -Nru npth-1.5/autogen.sh npth-1.6/autogen.sh --- npth-1.5/autogen.sh 2014-01-10 14:55:13.000000000 +0000 +++ npth-1.6/autogen.sh 2018-07-16 07:16:03.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # autogen.sh -# Copyright (C) 2003, 2014 g10 Code GmbH +# Copyright (C) 2003, 2014, 2017, 2018 g10 Code GmbH # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -15,7 +15,7 @@ # configure it for the respective package. It is maintained as part of # GnuPG and source copied by other packages. # -# Version: 2014-01-10 +# Version: 2018-07-10 configure_ac="configure.ac" @@ -41,7 +41,7 @@ info () { if [ -z "${SILENT}" ]; then - echo "autogen.sh:" "$*" + echo "autogen.sh:" "$*" >&2 fi } @@ -70,6 +70,8 @@ DIE=no FORCE= SILENT= +PRINT_HOST=no +PRINT_BUILD=no tmp=$(dirname "$0") tsdir=$(cd "${tmp}"; pwd) @@ -77,7 +79,18 @@ SILENT=" --silent" fi if test x"$1" = x"--help"; then - echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]" + echo "usage: ./autogen.sh [OPTIONS] [ARGS]" + echo " Options:" + echo " --silent Silent operation" + echo " --force Pass --force to autoconf" + echo " --find-version Helper for configure.ac" + echo " --git-build Run all commands to build from a Git" + echo " --print-host Print only the host triplet" + echo " --print-build Print only the build platform triplet" + echo " --build-TYPE Configure to cross build for TYPE" + echo "" + echo " ARGS are passed to configure in --build-TYPE mode." + echo " Configuration for this script is expected in autogen.rc" exit 0 fi if test x"$1" = x"--silent"; then @@ -88,6 +101,14 @@ FORCE=" --force" shift fi +if test x"$1" = x"--print-host"; then + PRINT_HOST=yes + shift +fi +if test x"$1" = x"--print-build"; then + PRINT_BUILD=yes + shift +fi # Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces @@ -133,6 +154,15 @@ myhost="" myhostsub="" case "$1" in + --find-version) + myhost="find-version" + SILENT=" --silent" + shift + ;; + --git-build) + myhost="git-build" + shift + ;; --build-w32) myhost="w32" shift @@ -161,6 +191,25 @@ die_p +# **** GIT BUILD **** +# This is a helper to build from git. +if [ "$myhost" = "git-build" ]; then + tmp="$(pwd)" + cd "$tsdir" || fatal "error cd-ing to $tsdir" + ./autogen.sh || fatal "error running ./autogen.sh" + cd "$tmp" || fatal "error cd-ing back to $tmp" + die_p + "$tsdir"/configure || fatal "error running $tsdir/configure" + die_p + make || fatal "error running make" + die_p + make check || fatal "error running male check" + die_p + exit 0 +fi +# **** end GIT BUILD **** + + # Source our configuration if [ -f "${tsdir}/autogen.rc" ]; then . "${tsdir}/autogen.rc" @@ -172,16 +221,78 @@ . "$HOME/.gnupg-autogen.rc" fi + +# **** FIND VERSION **** +# This is a helper for the configure.ac M4 magic +# Called +# ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO] +# returns a complete version string with automatic beta numbering. +if [ "$myhost" = "find-version" ]; then + package="$1" + major="$2" + minor="$3" + micro="$4" + + if [ -z "$package" -o -z "$major" -o -z "$minor" ]; then + echo "usage: ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO]" >&2 + exit 1 + fi + + if [ -z "$micro" ]; then + matchstr1="$package-$major.[0-9]*" + matchstr2="$package-$major-base" + vers="$major.$minor" + else + matchstr1="$package-$major.$minor.[0-9]*" + matchstr2="$package-$major.$minor-base" + vers="$major.$minor.$micro" + fi + + beta=no + if [ -e .git ]; then + ingit=yes + tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) + tmp=$(echo "$tmp" | sed s/^"$package"//) + if [ -n "$tmp" ]; then + tmp=$(echo "$tmp" | sed s/^"$package"// \ + | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}') + else + tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \ + | awk -F- '$4!=0{print"-beta"$4}') + fi + [ -n "$tmp" ] && beta=yes + rev=$(git rev-parse --short HEAD | tr -d '\n\r') + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no + beta=yes + tmp="-unknown" + rev="0000000" + rvd="0" + fi + + echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:" + exit 0 +fi +# **** end FIND VERSION **** + + +if [ ! -f "$tsdir/build-aux/config.guess" ]; then + fatal "$tsdir/build-aux/config.guess not found" + exit 1 +fi +build=`$tsdir/build-aux/config.guess` +if [ $PRINT_BUILD = yes ]; then + echo "$build" + exit 0 +fi + + + # ****************** # W32 build script # ****************** if [ "$myhost" = "w32" ]; then - if [ ! -f "$tsdir/build-aux/config.guess" ]; then - fatal "$tsdir/build-aux/config.guess not found" - exit 1 - fi - build=`$tsdir/build-aux/config.guess` - case $myhostsub in ce) w32root="$w32ce_root" @@ -222,6 +333,10 @@ fi die_p fi + if [ $PRINT_HOST = yes ]; then + echo "$host" + exit 0 + fi if [ -f "$tsdir/config.log" ]; then if ! head $tsdir/config.log | grep "$host" >/dev/null; then @@ -232,7 +347,8 @@ $tsdir/configure --enable-maintainer-mode ${SILENT} \ --prefix=${w32root} \ - --host=${host} --build=${build} \ + --host=${host} --build=${build} SYSROOT=${w32root} \ + PKG_CONFIG_LIBDIR=${w32root}/lib/pkgconfig \ ${configure_opts} ${extraoptions} "$@" rc=$? exit $rc @@ -242,13 +358,6 @@ # ***** AMD64 cross build script ******* # Used to cross-compile for AMD64 (for testing) if [ "$myhost" = "amd64" ]; then - shift - if [ ! -f $tsdir/build-aux/config.guess ]; then - echo "$tsdir/build-aux/config.guess not found" >&2 - exit 1 - fi - build=`$tsdir/build-aux/config.guess` - [ -z "$amd64root" ] && amd64root="$HOME/amd64root" info "Using $amd64root as standard install directory" replace_sysroot @@ -269,6 +378,10 @@ echo "Stop." >&2 exit 1 fi + if [ $PRINT_HOST = yes ]; then + echo "$host" + exit 0 + fi if [ -f "$tsdir/config.log" ]; then if ! head $tsdir/config.log | grep "$host" >/dev/null; then @@ -341,13 +454,16 @@ # Check the git setup. if [ -d .git ]; then - CP="cp -a" - [ -z "${SILENT}" ] && CP="$CP -v" + CP="cp -p" + # If we have a GNU cp we can add -v + if cp --version >/dev/null 2>/dev/null; then + [ -z "${SILENT}" ] && CP="$CP -v" + fi if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then [ -z "${SILENT}" ] && cat < + + Release 1.6. + + commit 771287929ed226add3ef27de882c5359dcd3f66e + * configure.ac: Bump LT version to C1/A1/R2. + +2018-07-12 NIIBE Yutaka + + build: Let configure create the VERSION file. + + commit 90e3dda03585dd4c1bcbab3da194cb9aee9c80fe + * autogen.sh: Update from libgpg-error. + * configure.ac: Use mym4_* things to create VERSION file. + * Makefile.am (dist-hook): Do not create VERSION. + (EXTRA_DIST): Add VERSION. + +2018-05-28 NIIBE Yutaka + + build: Fix libraries for HP-UX. + + commit f8b8e5d1112a7b1aee0669ed14679ca27e8a95df + * configure.ac: HP-UX requires -lpthread and -lrt. + +2017-11-30 NIIBE Yutaka + + w32: Fix memory leak for npth_create. + + commit 167b0dde6f77a15af2e75da570e88720a335705e + * w32/npth.c (npth_create): Free ATTR when allocated. + (npth_attr_destroy): Clear. + 2017-06-02 Werner Koch Release 1.5. diff -Nru npth-1.5/config.h.in npth-1.6/config.h.in --- npth-1.5/config.h.in 2017-06-02 08:42:12.000000000 +0000 +++ npth-1.6/config.h.in 2018-07-16 07:33:36.000000000 +0000 @@ -118,7 +118,7 @@ */ #undef LT_OBJDIR -/* Name of this package */ +/* Name of package */ #undef PACKAGE /* Define to the address where bug reports for this package should be sent. */ @@ -164,7 +164,7 @@ #endif -/* Version of this package */ +/* Version number of package */ #undef VERSION /* Define to 1 if on MINIX. */ diff -Nru npth-1.5/configure npth-1.6/configure --- npth-1.5/configure 2017-06-02 08:41:45.000000000 +0000 +++ npth-1.6/configure 2018-07-16 07:33:37.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for npth 1.5. +# Generated by GNU Autoconf 2.69 for npth 1.6. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: gnupg-devel@gnupg.org about your system, including any +$0: https://bugs.gnupg.org about your system, including any $0: error possibly output before this message. Then install $0: a modern shell, or manually run the script under such a $0: shell if you do have one." @@ -590,9 +590,9 @@ # Identity of this package. PACKAGE_NAME='npth' PACKAGE_TARNAME='npth' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='npth 1.5' -PACKAGE_BUGREPORT='gnupg-devel@gnupg.org' +PACKAGE_VERSION='1.6' +PACKAGE_STRING='npth 1.6' +PACKAGE_BUGREPORT='https://bugs.gnupg.org' PACKAGE_URL='' ac_unique_file="src/npth.c" @@ -685,9 +685,6 @@ AS RUN_TESTS_FALSE RUN_TESTS_TRUE -LIBNPTH_LT_REVISION -LIBNPTH_LT_AGE -LIBNPTH_LT_CURRENT EGREP GREP CPP @@ -746,6 +743,10 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +VERSION_NUMBER +LIBNPTH_LT_REVISION +LIBNPTH_LT_AGE +LIBNPTH_LT_CURRENT target_alias host_alias build_alias @@ -1349,7 +1350,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures npth 1.5 to adapt to many kinds of systems. +\`configure' configures npth 1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1419,7 +1420,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of npth 1.5:";; + short | recursive ) echo "Configuration of npth 1.6:";; esac cat <<\_ACEOF @@ -1468,7 +1469,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1531,7 +1532,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -npth configure 1.5 +npth configure 1.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1690,9 +1691,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------ ## -## Report this to gnupg-devel@gnupg.org ## -## ------------------------------------ ##" +( $as_echo "## ------------------------------------- ## +## Report this to https://bugs.gnupg.org ## +## ------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1954,7 +1955,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by npth $as_me 1.5, which was +It was created by npth $as_me 1.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2303,24 +2304,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) # (Interfaces added: AGE++) -# (Interfaces removed/changed: AGE=0) +# (Interfaces removed: AGE=0) # LIBNPTH_LT_CURRENT=1 LIBNPTH_LT_AGE=1 -LIBNPTH_LT_REVISION=1 +LIBNPTH_LT_REVISION=2 +################################################ + + + + + +VERSION_NUMBER=0x010600 + # If the API is changed in an incompatible way: increment the next counter. NPTH_CONFIG_API_VERSION=1 ############################################## -PACKAGE=$PACKAGE_NAME -VERSION=$PACKAGE_VERSION - ac_aux_dir= for ac_dir in build-aux "$srcdir"/build-aux; do if test -f "$ac_dir/install-sh"; then @@ -2350,10 +2355,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - -ac_config_headers="$ac_config_headers config.h" - - am__api_version='1.14' # Find a good install program. We prefer a C program (faster), @@ -2840,7 +2841,7 @@ # Define the identity of the package. PACKAGE='npth' - VERSION='1.5' + VERSION='1.6' cat >>confdefs.h <<_ACEOF @@ -2956,6 +2957,10 @@ MAINT=$MAINTAINER_MODE_TRUE + +ac_config_headers="$ac_config_headers config.h" + + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -5298,23 +5303,6 @@ - - - - - - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - - run_tests="yes" # Check whether --enable-tests was given. if test "${enable_tests+set}" = set; then : @@ -13010,7 +12998,7 @@ *-*-aix*) have_fork_unsafe_semaphore=yes ;; - *-*-dragonfly*|*-*-freebsd*|*-*-netbsd*) + *-*-dragonfly*|*-*-freebsd*|*-*-netbsd*|*-*-hpux*) LIBS="-lpthread $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5 $as_echo_n "checking for library containing sem_init... " >&6; } @@ -13142,7 +13130,7 @@ if test "$have_w32_system" = yes; then BUILD_ISODATE=`date --iso-8601` BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` - BUILD_FILEVERSION="${BUILD_FILEVERSION}30656" + BUILD_FILEVERSION="${BUILD_FILEVERSION}git_revision_dec" fi @@ -14333,7 +14321,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by npth $as_me 1.5, which was +This file was extended by npth $as_me 1.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14393,13 +14381,13 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -npth config.status 1.5 +npth config.status 1.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16391,8 +16379,8 @@ echo " - $PACKAGE_NAME-$PACKAGE_VERSION prepared for make + $PACKAGE_NAME v$PACKAGE_VERSION prepared for make - Revision: 77c094e (30656) + Revision: 7712879 (30482) Platform: $host " diff -Nru npth-1.5/configure.ac npth-1.6/configure.ac --- npth-1.5/configure.ac 2017-06-02 08:39:01.000000000 +0000 +++ npth-1.6/configure.ac 2018-07-16 07:19:28.000000000 +0000 @@ -26,47 +26,56 @@ # the version number immediately after the release and do another # commit and push so that the git magic is able to work. # See below for the LT versions. -m4_define(my_version, [1.5]) +m4_define([mym4_package],[npth]) +m4_define([mym4_major], [1]) +m4_define([mym4_minor], [6]) + +# To start a new development series, i.e a new major or minor number +# you need to mark an arbitrary commit before the first beta release +# with an annotated tag. For example a 2.1 branch starts off with +# the tag "foo-2.1-base". This is used as the base for counting +# beta numbers before the first release of a series. # Below is m4 magic to extract and compute the git revision number, # the decimalized short revision number, a beta version string and a -# flag indicating a development version (my_isgit). The latter works -# by requiring the final tag in the repository. -m4_define([git_revision], - m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) -m4_define([git_revision_dec], - m4_esyscmd_s([echo $((0x$(echo ]git_revision[|head -c 4)))])) -m4_define([git_betastring], - m4_esyscmd_s([git describe --match 'npth-[0-9].*[0-9]' --long|\ - awk -F- '$3!=0{print"-beta"$3}'])) -m4_define([my_isgit],m4_if(git_betastring,[],[no],[yes])) -m4_define([my_full_version],[my_version[]git_betastring]) - -AC_INIT([npth],[my_full_version],[gnupg-devel@gnupg.org]) - +# flag indicating a development version (mym4_isbeta). Note that the +# m4 processing is done by autoconf and not during the configure run. +m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \ + mym4_package mym4_major mym4_minor),[:])) +m4_define([mym4_isbeta], m4_argn(2, mym4_verslist)) +m4_define([mym4_version], m4_argn(4, mym4_verslist)) +m4_define([mym4_revision], m4_argn(7, mym4_verslist)) +m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist)) +m4_esyscmd([echo ]mym4_version[>VERSION]) +AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org]) # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) # (Interfaces added: AGE++) -# (Interfaces removed/changed: AGE=0) +# (Interfaces removed: AGE=0) # LIBNPTH_LT_CURRENT=1 LIBNPTH_LT_AGE=1 -LIBNPTH_LT_REVISION=1 +LIBNPTH_LT_REVISION=2 +################################################ + +AC_SUBST(LIBNPTH_LT_CURRENT) +AC_SUBST(LIBNPTH_LT_AGE) +AC_SUBST(LIBNPTH_LT_REVISION) + +VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x00" mym4_major mym4_minor) +AC_SUBST(VERSION_NUMBER) # If the API is changed in an incompatible way: increment the next counter. NPTH_CONFIG_API_VERSION=1 ############################################## -PACKAGE=$PACKAGE_NAME -VERSION=$PACKAGE_VERSION - AC_CONFIG_AUX_DIR([build-aux]) +AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) +AM_MAINTAINER_MODE AC_CONFIG_SRCDIR([src/npth.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) -AM_MAINTAINER_MODE AC_CANONICAL_HOST AM_SILENT_RULES @@ -81,15 +90,6 @@ # Checks for programs. AC_PROG_CC -AC_SUBST(LIBNPTH_LT_CURRENT) -AC_SUBST(LIBNPTH_LT_AGE) -AC_SUBST(LIBNPTH_LT_REVISION) - -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package]) - run_tests="yes" AC_ARG_ENABLE(tests, AC_HELP_STRING([--disable-tests], [disable tests]), @@ -120,7 +120,7 @@ *-*-aix*) have_fork_unsafe_semaphore=yes ;; - *-*-dragonfly*|*-*-freebsd*|*-*-netbsd*) + *-*-dragonfly*|*-*-freebsd*|*-*-netbsd*|*-*-hpux*) LIBS="-lpthread $LIBS" AC_SEARCH_LIBS([sem_init],[rt]) ;; @@ -365,8 +365,8 @@ AC_OUTPUT echo " - $PACKAGE_NAME-$PACKAGE_VERSION prepared for make + $PACKAGE_NAME v$PACKAGE_VERSION prepared for make - Revision: git_revision (git_revision_dec) + Revision: mym4_revision (mym4_revision_dec) Platform: $host " diff -Nru npth-1.5/debian/changelog npth-1.6/debian/changelog --- npth-1.5/debian/changelog 2017-11-12 05:14:50.000000000 +0000 +++ npth-1.6/debian/changelog 2022-10-18 00:48:01.000000000 +0000 @@ -1,3 +1,49 @@ +npth (1.6-3~18.04.sav0) bionic; urgency=medium + + * Backport to Bionic + * debian/control: Set debhelper-compat (= 11) BD + + -- Rob Savoury Mon, 17 Oct 2022 17:48:01 -0700 + +npth (1.6-3) unstable; urgency=medium + + [ Debian Janitor ] + * Apply multi-arch hints. + + libnpth-mingw-w64-dev: Add Multi-Arch: foreign. + + [ Eric Dorland ] + * Add dch section + * debhelper compat level to 12 + * Standards-Version to 4.5.0.3 + * Add Rules-Requires-Root: no + * Drop --ddeb-migration + + -- Eric Dorland Sat, 17 Oct 2020 23:16:57 -0400 + +npth (1.6-2) unstable; urgency=medium + + [ Debian Janitor ] + * Trim trailing whitespace. + * Use secure copyright file specification URI. + * Set debhelper-compat version in Build-Depends. + * Remove Section on libnpth-mingw-w64-dev that duplicates source. + + -- Eric Dorland Mon, 15 Jun 2020 00:40:15 -0400 + +npth (1.6-1) unstable; urgency=medium + + * New upstream release. + + -- Eric Dorland Tue, 17 Jul 2018 14:11:00 -0400 + +npth (1.5-4) unstable; urgency=medium + + * Update VCS fields to point at salsa.debian.org + * Update debhelper to version 11 + * Standards-Version to 4.1.4.1 + + -- Eric Dorland Sun, 03 Jun 2018 01:12:03 -0400 + npth (1.5-3) unstable; urgency=medium * debian/rules: Fix buildpath embedding for windows build. Thanks Daniel @@ -142,5 +188,3 @@ * Initial release. (Closes: #672202) -- Eric Dorland Wed, 09 May 2012 00:21:14 -0400 - - diff -Nru npth-1.5/debian/compat npth-1.6/debian/compat --- npth-1.5/debian/compat 2017-11-12 05:14:50.000000000 +0000 +++ npth-1.6/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru npth-1.5/debian/control npth-1.6/debian/control --- npth-1.5/debian/control 2017-11-12 05:14:50.000000000 +0000 +++ npth-1.6/debian/control 2022-10-18 00:48:01.000000000 +0000 @@ -2,12 +2,13 @@ Section: libdevel Priority: optional Maintainer: Eric Dorland -Build-Depends: debhelper (>= 10) +Build-Depends: debhelper-compat (= 11) Build-Depends-Indep: mingw-w64 -Standards-Version: 4.1.1.1 +Standards-Version: 4.5.0.3 +Rules-Requires-Root: no Homepage: https://www.gnupg.org/ -Vcs-Git: https://anonscm.debian.org/git/users/eric/npth.git -Vcs-Browser: https://anonscm.debian.org/cgit/users/eric/npth.git +Vcs-Git: https://salsa.debian.org/eric/npth.git +Vcs-Browser: https://salsa.debian.org/eric/npth Package: libnpth0-dev Architecture: any @@ -40,9 +41,9 @@ Package: libnpth-mingw-w64-dev Architecture: all -Section: libdevel Suggests: mingw-w64 Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: foreign Description: replacement for GNU Pth using system threads (Windows dev) nPth is a non-preemptive threads implementation using an API very similar to the one known from GNU Pth. It has been designed as a diff -Nru npth-1.5/debian/copyright npth-1.6/debian/copyright --- npth-1.5/debian/copyright 2017-11-12 05:14:50.000000000 +0000 +++ npth-1.6/debian/copyright 2020-10-18 03:16:57.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: nPth Upstream-Contact: Werner Koch Source: ftp://ftp.gnupg.org/gcrypt/npth/ diff -Nru npth-1.5/debian/gbp.conf npth-1.6/debian/gbp.conf --- npth-1.5/debian/gbp.conf 2017-11-12 05:14:50.000000000 +0000 +++ npth-1.6/debian/gbp.conf 2020-10-18 03:16:57.000000000 +0000 @@ -1,3 +1,6 @@ [DEFAULT] pristine-tar = True upstream-vcs-tag = npth-%(version)s + +[dch] +commit-msg = debian/changelog: %(version)s diff -Nru npth-1.5/debian/rules npth-1.6/debian/rules --- npth-1.5/debian/rules 2017-11-12 05:14:50.000000000 +0000 +++ npth-1.6/debian/rules 2020-10-18 03:16:57.000000000 +0000 @@ -15,9 +15,6 @@ override_dh_makeshlibs: dh_makeshlibs -V -override_dh_strip: - dh_strip --ddeb-migration='libnpth0-dbg (<< 1.2-2~)' - ### "arch-independent" Windows builds: ### WIN_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp" \ diff -Nru npth-1.5/Makefile.am npth-1.6/Makefile.am --- npth-1.5/Makefile.am 2017-05-16 07:15:57.000000000 +0000 +++ npth-1.6/Makefile.am 2018-07-16 07:16:03.000000000 +0000 @@ -20,7 +20,8 @@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = npth-config.in npth.m4 npth.spec.in autogen.sh autogen.rc HACKING +EXTRA_DIST = npth-config.in npth.m4 npth.spec.in autogen.sh autogen.rc \ + HACKING VERSION bin_SCRIPTS = npth-config m4datadir = $(datadir)/aclocal m4data_DATA = npth.m4 @@ -45,7 +46,6 @@ @set -e; \ sed -e 's/@pkg_version@/$(VERSION)/g' \ $(top_srcdir)/npth.spec.in > $(distdir)/npth.spec - echo "$(VERSION)" > $(distdir)/VERSION gen_start_date = 2011-12-01T00:00:00 diff -Nru npth-1.5/Makefile.in npth-1.6/Makefile.in --- npth-1.5/Makefile.in 2017-06-02 08:41:44.000000000 +0000 +++ npth-1.6/Makefile.in 2018-07-16 07:33:36.000000000 +0000 @@ -337,6 +337,7 @@ STRIP = @STRIP@ SYS_SOCKET_H = @SYS_SOCKET_H@ VERSION = @VERSION@ +VERSION_NUMBER = @VERSION_NUMBER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -393,7 +394,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = npth-config.in npth.m4 npth.spec.in autogen.sh autogen.rc HACKING +EXTRA_DIST = npth-config.in npth.m4 npth.spec.in autogen.sh autogen.rc \ + HACKING VERSION + bin_SCRIPTS = npth-config m4datadir = $(datadir)/aclocal m4data_DATA = npth.m4 @@ -955,7 +958,6 @@ @set -e; \ sed -e 's/@pkg_version@/$(VERSION)/g' \ $(top_srcdir)/npth.spec.in > $(distdir)/npth.spec - echo "$(VERSION)" > $(distdir)/VERSION .PHONY: gen-ChangeLog gen-ChangeLog: if test -d $(top_srcdir)/.git; then \ diff -Nru npth-1.5/NEWS npth-1.6/NEWS --- npth-1.5/NEWS 2017-06-02 08:38:49.000000000 +0000 +++ npth-1.6/NEWS 2018-07-16 07:19:47.000000000 +0000 @@ -1,3 +1,11 @@ +Noteworthy changes in version 1.6 (2018-07-16) [C1/A1/R2] +---------------------------------------------- + + * Fix library requirements for HPUX. [#3980] + + * Fix a minor memory leak on Windows. + + Noteworthy changes in version 1.5 (2017-06-02) [C1/A1/R1] ---------------------------------------------- diff -Nru npth-1.5/npth.spec npth-1.6/npth.spec --- npth-1.5/npth.spec 2017-06-02 08:42:13.000000000 +0000 +++ npth-1.6/npth.spec 2018-07-16 07:34:13.000000000 +0000 @@ -1,7 +1,7 @@ # This is a template. The dist target uses it to create the real file. Summary: NPTH - the new GNU Portable Threads Library Name: npth -Version: 1.5 +Version: 1.6 Release: 1 URL: http://www.gnupg.org/ Source: ftp://ftp.gnupg.org/gcrypt/alpha diff -Nru npth-1.5/src/Makefile.in npth-1.6/src/Makefile.in --- npth-1.5/src/Makefile.in 2017-06-02 08:41:44.000000000 +0000 +++ npth-1.6/src/Makefile.in 2018-07-16 07:33:36.000000000 +0000 @@ -297,6 +297,7 @@ STRIP = @STRIP@ SYS_SOCKET_H = @SYS_SOCKET_H@ VERSION = @VERSION@ +VERSION_NUMBER = @VERSION_NUMBER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru npth-1.5/tests/Makefile.in npth-1.6/tests/Makefile.in --- npth-1.5/tests/Makefile.in 2017-06-02 08:41:44.000000000 +0000 +++ npth-1.6/tests/Makefile.in 2018-07-16 07:33:36.000000000 +0000 @@ -315,6 +315,7 @@ STRIP = @STRIP@ SYS_SOCKET_H = @SYS_SOCKET_H@ VERSION = @VERSION@ +VERSION_NUMBER = @VERSION_NUMBER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru npth-1.5/VERSION npth-1.6/VERSION --- npth-1.5/VERSION 2017-06-02 08:42:13.000000000 +0000 +++ npth-1.6/VERSION 2018-07-16 07:33:37.000000000 +0000 @@ -1 +1 @@ -1.5 +1.6 diff -Nru npth-1.5/w32/Makefile.in npth-1.6/w32/Makefile.in --- npth-1.5/w32/Makefile.in 2017-06-02 08:41:44.000000000 +0000 +++ npth-1.6/w32/Makefile.in 2018-07-16 07:33:36.000000000 +0000 @@ -298,6 +298,7 @@ STRIP = @STRIP@ SYS_SOCKET_H = @SYS_SOCKET_H@ VERSION = @VERSION@ +VERSION_NUMBER = @VERSION_NUMBER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru npth-1.5/w32/npth.c npth-1.6/w32/npth.c --- npth-1.5/w32/npth.c 2017-05-16 07:19:13.000000000 +0000 +++ npth-1.6/w32/npth.c 2018-07-16 07:15:59.000000000 +0000 @@ -384,6 +384,7 @@ npth_attr_destroy (npth_attr_t *attr) { free (*attr); + *attr = NULL; return 0; } @@ -531,6 +532,9 @@ ResumeThread (thread->handle); + if (attr_allocated) + npth_attr_destroy (&attr); + return 0; err_out: