Hello community,
here is the log from the commit of package libgtpnl for openSUSE:Factory checked in at 2019-01-05 14:42:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libgtpnl (Old)
and /work/SRC/openSUSE:Factory/.libgtpnl.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgtpnl"
Sat Jan 5 14:42:02 2019 rev:3 rq:657713 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libgtpnl/libgtpnl.changes 2017-12-29 18:51:58.986396834 +0100
+++ /work/SRC/openSUSE:Factory/.libgtpnl.new.28833/libgtpnl.changes 2019-01-05 14:42:08.368491381 +0100
@@ -1,0 +2,6 @@
+Tue Dec 11 00:42:16 UTC 2018 - Jan Engelhardt
+
+- Update to new upstream release 1.2.0
+ * Fix CTRL_ATTR_FAMILY_ID attribute size
+
+-------------------------------------------------------------------
Old:
----
libgtpnl-1.1.0.tar.xz
New:
----
libgtpnl-1.2.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgtpnl.spec ++++++
--- /var/tmp/diff_new_pack.D0ivuw/_old 2019-01-05 14:42:08.832490988 +0100
+++ /var/tmp/diff_new_pack.D0ivuw/_new 2019-01-05 14:42:08.836490984 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libgtpnl
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,15 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: libgtpnl
-Version: 1.1.0
+Version: 1.2.0
Release: 0
Summary: GPRS tunnel configuration library
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Url: https://osmocom.org/projects/linux-kernel-gtp-u/wiki
@@ -37,7 +37,7 @@
%package -n libgtpnl0
Summary: GPRS tunnel configuration library
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: System/Libraries
%description -n libgtpnl0
@@ -46,7 +46,7 @@
%package devel
Summary: Development files for the GPRS tunnel config library
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Requires: libgtpnl0 = %version
@@ -61,6 +61,7 @@
%setup -q
%build
+echo "%version" >.tarball-version
autoreconf -fi
%configure --includedir="%_includedir/%name"
make %{?_smp_mflags}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.D0ivuw/_old 2019-01-05 14:42:08.864490960 +0100
+++ /var/tmp/diff_new_pack.D0ivuw/_new 2019-01-05 14:42:08.864490960 +0100
@@ -2,8 +2,8 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://git.osmocom.org/libgtpnl</param>
- <param name="revision">1.1.0</param>
- <param name="versionformat">1.1.0</param>
+ <param name="revision">1.2.0</param>
+ <param name="versionformat">1.2.0</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ libgtpnl-1.1.0.tar.xz -> libgtpnl-1.2.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/Make_global.am new/libgtpnl-1.2.0/Make_global.am
--- old/libgtpnl-1.1.0/Make_global.am 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/Make_global.am 2018-05-02 16:37:14.000000000 +0200
@@ -1,24 +1,2 @@
-# This is _NOT_ the library release version, it's an API version.
-# Extracted from Chapter 6 "Library interface versions" of the libtool docs.
-#
-# <snippet>
-# Here are a set of rules to help you update your library version information:
-#
-# 1. Start with version information of `0:0:0' for each libtool library.
-# 2. Update the version information only immediately before a public release
-# of your software. More frequent updates are unnecessary, and only guarantee
-# that the current interface number gets larger faster.
-# 3. If the library source code has changed at all since the last update,
-# then increment revision (`c:r:a' becomes `c:r+1:a').
-# 4. If any interfaces have been added, removed, or changed since the last
-# update, increment current, and set revision to 0.
-# 5. If any interfaces have been added since the last public release, then
-# increment age.
-# 6. If any interfaces have been removed since the last public release, then
-# set age to 0.
-# </snippet>
-#
-LIBVERSION=1:0:1
-
AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS}
AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/Makefile.am new/libgtpnl-1.2.0/Makefile.am
--- old/libgtpnl-1.1.0/Makefile.am 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/Makefile.am 2018-05-02 16:37:14.000000000 +0200
@@ -1,5 +1,7 @@
include $(top_srcdir)/Make_global.am
+@RELMAKE@
+
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src include tools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/TODO-RELEASE new/libgtpnl-1.2.0/TODO-RELEASE
--- old/libgtpnl-1.1.0/TODO-RELEASE 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/TODO-RELEASE 2018-05-02 16:37:14.000000000 +0200
@@ -0,0 +1,9 @@
+# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
+# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info....
+# In short:
+# LIBVERSION=c:r:a
+# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
+# If any interfaces have been added since the last public release: c:r:a + 1.
+# If any interfaces have been removed or changed since the last public release: c:r:0.
+#library what description / commit summary line
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/configure.ac new/libgtpnl-1.2.0/configure.ac
--- old/libgtpnl-1.1.0/configure.ac 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/configure.ac 2018-05-02 16:37:14.000000000 +0200
@@ -1,12 +1,18 @@
dnl Process this file with autoconf to create configure.
-AC_INIT([libgtpnl], [1.1.0])
+AC_INIT([libgtpnl],
+ m4_esyscmd([./git-version-gen .tarball-version]),
+ [osmocom-net-gprs@lists.osmocom.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign tar-pax no-dist-gzip dist-bzip2 1.6 subdir-objects])
+dnl include release helper
+RELMAKE='-include osmo-release.mk'
+AC_SUBST([RELMAKE])
+
dnl kernel style compile messages
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/debian/changelog new/libgtpnl-1.2.0/debian/changelog
--- old/libgtpnl-1.1.0/debian/changelog 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/debian/changelog 2018-05-02 16:37:14.000000000 +0200
@@ -1,4 +1,10 @@
-libgtpnl (1.1.0) UNRELEASED; urgency=medium
+libgtpnl (1.2.0) unstable; urgency=medium
+
+ * Fix CTRL_ATTR_FAMILY_ID attribute size
+
+ -- Harald Welte Wed, 02 May 2018 16:37:14 +0200
+
+libgtpnl (1.1.0) unstable; urgency=medium
* Add genl_socket_close() function
* Add contrib/jenkins.sh for jenkins build verification
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/git-version-gen new/libgtpnl-1.2.0/git-version-gen
--- old/libgtpnl-1.1.0/git-version-gen 1970-01-01 01:00:00.000000000 +0100
+++ new/libgtpnl-1.2.0/git-version-gen 2018-05-02 16:37:14.000000000 +0200
@@ -0,0 +1,151 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2010-01-28.01
+
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
+# It may be run two ways:
+# - from a git repository in which the "git describe" command below
+# produces useful output (thus requiring at least one signed tag)
+# - from a non-git-repo directory containing a .tarball-version file, which
+# presumes this script is invoked like "./git-version-gen .tarball-version".
+
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+# a checked-out repository. Created with contents that were learned at
+# the last time autoconf was run, and used by git-version-gen. Must not
+# be present in either $(srcdir) or $(builddir) for git-version-gen to
+# give accurate answers during normal development with a checked out tree,
+# but must be present in a tarball when there is no version control system.
+# Therefore, it cannot be used in any dependencies. GNUmakefile has
+# hooks to force a reconfigure at distribution time to get the value
+# correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+# tarball. Usable in dependencies, particularly for files that don't
+# want to depend on config.h but do want to track version changes.
+# Delete this file prior to any autoconf run where you want to rebuild
+# files to pick up a version string change; and leave it stale to
+# minimize rebuild time after unrelated changes to configure sources.
+#
+# It is probably wise to add these two files to .gitignore, so that you
+# don't accidentally commit either generated file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+# m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+# [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .tarball-version will
+# exist in distribution tarballs.
+#
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+# echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+# echo $(VERSION) > $(distdir)/.tarball-version
+
+case $# in
+ 1) ;;
+ *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
+esac
+
+tarball_version_file=$1
+nl='
+'
+
+# First see if there is a tarball-only version file.
+# then try "git describe", then default.
+if test -f $tarball_version_file
+then
+ v=`cat $tarball_version_file` || exit 1
+ case $v in
+ *$nl*) v= ;; # reject multi-line output
+ [0-9]*) ;;
+ *) v= ;;
+ esac
+ test -z "$v" \
+ && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+fi
+
+if test -n "$v"
+then
+ : # use $v
+elif
+ v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+ || git describe --abbrev=4 HEAD 2>/dev/null` \
+ && case $v in
+ [0-9]*) ;;
+ v[0-9]*) ;;
+ *) (exit 1) ;;
+ esac
+then
+ # Is this a new git that lists number of commits since the last
+ # tag or the previous older version that did not?
+ # Newer: v6.10-77-g0f8faeb
+ # Older: v6.10-g0f8faeb
+ case $v in
+ *-*-*) : git describe is okay three part flavor ;;
+ *-*)
+ : git describe is older two part flavor
+ # Recreate the number of commits and rewrite such that the
+ # result is the same as if we were using the newer version
+ # of git describe.
+ vtag=`echo "$v" | sed 's/-.*//'`
+ numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+ v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+ ;;
+ esac
+
+ # Change the first '-' to a '.', so version-comparing tools work properly.
+ # Remove the "g" in git describe's output string, to save a byte.
+ v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+else
+ v=UNKNOWN
+fi
+
+v=`echo "$v" |sed 's/^v//'`
+
+# Don't declare a version "dirty" merely because a time stamp has changed.
+git status > /dev/null 2>&1
+
+dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+case "$dirty" in
+ '') ;;
+ *) # Append the suffix only if there isn't one already.
+ case $v in
+ *-dirty) ;;
+ *) v="$v-dirty" ;;
+ esac ;;
+esac
+
+# Omit the trailing newline, so that m4_esyscmd can use the result directly.
+echo "$v" | tr -d '\012'
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/src/Makefile.am new/libgtpnl-1.2.0/src/Makefile.am
--- old/libgtpnl-1.1.0/src/Makefile.am 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/src/Makefile.am 2018-05-02 16:37:14.000000000 +0200
@@ -1,4 +1,10 @@
include $(top_srcdir)/Make_global.am
+
+# This is _NOT_ the library release version, it's an API version.
+# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
+LIBVERSION=1:1:1
+
+
lib_LTLIBRARIES = libgtpnl.la
noinst_HEADERS = internal.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/src/genl.c new/libgtpnl-1.2.0/src/genl.c
--- old/libgtpnl-1.1.0/src/genl.c 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/src/genl.c 2018-05-02 16:37:14.000000000 +0200
@@ -152,7 +152,7 @@
genl->cmd = CTRL_CMD_GETFAMILY;
genl->version = 1;
- mnl_attr_put_u32(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL);
+ mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL);
mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, subsys_name);
return nlh;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.1.0/tools/Makefile.am new/libgtpnl-1.2.0/tools/Makefile.am
--- old/libgtpnl-1.1.0/tools/Makefile.am 2017-11-12 15:33:02.000000000 +0100
+++ new/libgtpnl-1.2.0/tools/Makefile.am 2018-05-02 16:37:14.000000000 +0200
@@ -1,7 +1,7 @@
include $(top_srcdir)/Make_global.am
-check_PROGRAMS = gtp-link \
- gtp-tunnel
+noinst_PROGRAMS = gtp-link \
+ gtp-tunnel
gtp_link_SOURCES = gtp-link.c
gtp_link_LDADD = ../src/libgtpnl.la ${LIBMNL_LIBS}