bump version to 4.13.0-1
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Wed, 17 Jan 2018 08:09:08 +0000 (09:09 +0100)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Wed, 17 Jan 2018 09:10:00 +0000 (10:10 +0100)
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
20 files changed:
Makefile
debian/changelog
debian/compat
debian/control
debian/copyright
debian/iproute2-doc.docs
debian/iproute2-doc.examples [new file with mode: 0644]
debian/iproute2-doc.install
debian/iproute2.install
debian/iproute2.links
debian/iproute2.manpages
debian/patches/0001-Add-moo-feature.patch
debian/patches/0004-sync-iptables-header.patch [new file with mode: 0644]
debian/patches/f_u32 [deleted file]
debian/patches/netlink-buffer.patch [deleted file]
debian/patches/series
debian/rules
debian/watch
iproute2-4.10.0.orig.tar.gz [deleted file]
iproute2-4.13.0.orig.tar.xz [new file with mode: 0644]

index ed78c6c..d8917b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
-RELEASE=5.0
-
-VERSION=4.10.0
+VERSION=4.13.0
 PKGREL=1
 
 DIR=iproute2-${VERSION}
-SRC=iproute2-${VERSION}.orig.tar.gz
+SRC=iproute2-${VERSION}.orig.tar.xz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -24,9 +22,9 @@ ${DEBS} deb: ${SRC}
 
 
 download:
-       rm -rf iproute2-${VERSION} iproute2-${VERSION}.orig.tar.gz
+       rm -rf iproute2-${VERSION} $(SRC)
        git clone -b v${VERSION} --depth=1 git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git iproute2-${VERSION}
-       tar czf iproute2-${VERSION}.orig.tar.gz iproute2-${VERSION}/
+       tar cJf $(SRC) iproute2-${VERSION}/
 
 .PHONY: upload
 upload: ${DEBS}
@@ -34,7 +32,7 @@ upload: ${DEBS}
 
 .PHONY: clean
 clean:
-       rm -rf *~ debian/*~ *.changes *.dsc ${DIR} iproute2_${VERSION}.orig.tar.gz *.deb
+       rm -rf *~ debian/*~ *.changes *.dsc ${DIR} *.deb *.buildinfo
 
 .PHONY: dinstall
 dinstall: ${DEBS}
index 63b91e9..18da9b5 100644 (file)
@@ -1,3 +1,9 @@
+iproute2 (4.13.0-1) unstable; urgency=medium
+
+  * update to 4.13.0
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 17 Jan 2018 09:09:28 +0100
+
 iproute2 (4.10.0-1) unstable; urgency=medium
 
   * update to 4.10.0
index 45a4fb7..ec63514 100644 (file)
@@ -1 +1 @@
-8
+9
index 9c16e9c..e65855a 100644 (file)
@@ -1,20 +1,21 @@
 Source: iproute2
 Section: net
 Priority: optional
-Maintainer: Debian iproute2 Maintainers <ah-iproute@debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>,
-           Alexander Wirt <formorer@debian.org>
-Homepage: http://www.linux-foundation.org/en/Net:Iproute2
-Vcs-Browser: http://git.debian.org/?p=collab-maint/pkg-iproute.git
-Vcs-Git: git://git.debian.org/git/collab-maint/pkg-iproute.git
-Standards-Version: 3.9.6
+Maintainer: Alexander Wirt <formorer@debian.org>
+Uploaders: Luca Boccassi <bluca@debian.org>
+Homepage: https://wiki.linuxfoundation.org/networking/iproute2
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/pkg-iproute.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/pkg-iproute.git
+Standards-Version: 3.9.8
 Build-Depends: bison,
                cm-super-minimal,
-               debhelper (>= 8),
+               debhelper (>= 9),
                flex,
                iptables-dev,
                libatm1-dev,
                libdb-dev,
+               libelf-dev,
+               libmnl-dev,
                libselinux1-dev,
                linux-libc-dev,
                linuxdoc-tools,
@@ -22,6 +23,7 @@ Build-Depends: bison,
                pkg-config,
                texlive-fonts-recommended,
                texlive-latex-base,
+               texlive-latex-extra,
                texlive-latex-recommended
 
 Package: iproute2
@@ -58,6 +60,7 @@ Package: iproute
 Depends: iproute2, ${misc:Depends}
 Architecture: all
 Section: oldlibs
+Priority: extra
 Description: transitional dummy package for iproute2
  This is a transitional dummy package to get upgrading systems to install
  the iproute2 package. It can safely be removed once no other package
@@ -67,6 +70,7 @@ Package: iproute-doc
 Depends: iproute2-doc, ${misc:Depends}
 Architecture: all
 Section: oldlibs
+Priority: extra
 Description: transitional dummy package for iproute2-doc
  This is a transitional dummy package to get upgrading systems to install
  the iproute2-doc package. It can safely be removed once no other package
index 0b81f9b..fd660f6 100644 (file)
@@ -39,6 +39,7 @@ Modifications for Debian:
   Copyright (c) 1998-1999 Roberto Lumbreras <rover@debian.org>
   Copyright (c) 1999-2003 Juan Cespedes <cespedes@debian.org>
   Copyright (c) 2005-     Alexander Wirt <formorer@debian.org>
+  Copyright (c) 2008-2015 Andreas Henriksson <andreas@fatal.se>
 
 
 License
index c35f281..a3bb353 100644 (file)
@@ -1,4 +1,4 @@
 README* doc/Plan
+debian/htb/*
 doc/*.tex doc/*.dvi doc/*.ps doc/*.sty
 doc/*.txt doc/*.html
-debian/htb/* 
diff --git a/debian/iproute2-doc.examples b/debian/iproute2-doc.examples
new file mode 100644 (file)
index 0000000..e39721e
--- /dev/null
@@ -0,0 +1 @@
+examples/*
index 892d636..6dd90fc 100644 (file)
@@ -1 +1,2 @@
 debian/doc/htb/* /usr/share/doc/iproute2-doc/htb
+usr/share/doc/iproute2/* /usr/share/doc/iproute2-doc
index ade53b8..f7e6738 100644 (file)
@@ -1,8 +1,18 @@
-etc/* /etc
-ip/routef ip/routel /usr/bin
-ip/rtmon tc/tc misc/rtacct bridge/bridge /sbin
-misc/arpd /usr/sbin
-misc/lnstat misc/nstat /usr/bin/
-misc/ss ip/ip /bin
-netem/*.dist /usr/lib/tc
-tc/*.so /usr/lib/tc
+etc/
+sbin/arpd /usr/sbin
+sbin/bridge
+sbin/devlink
+sbin/genl /usr/sbin
+sbin/ip /bin
+sbin/lnstat /usr/bin/
+sbin/nstat /usr/bin/
+sbin/routef /usr/bin
+sbin/routel /usr/bin
+sbin/rtacct
+sbin/rtmon
+sbin/ss /bin
+sbin/tc
+sbin/tipc
+usr/lib/tc/
+usr/share/bash-completion/
+usr/share/man/
index 9dcf49c..46d168d 100644 (file)
@@ -1,4 +1,4 @@
-/usr/bin/lnstat usr/bin/rtstat
 /usr/bin/lnstat usr/bin/ctstat
-bin/ip sbin/ip
+/usr/bin/lnstat usr/bin/rtstat
 /usr/lib/tc/m_xt.so usr/lib/tc/m_ipt.so
+bin/ip sbin/ip
index 7f0e0c2..22e2de1 100644 (file)
@@ -1 +1,2 @@
-debian/tmp/usr/share/man/*/*
+man/man8/devlink*.8
+man/man8/genl.8
index 21eb2d0..b046590 100644 (file)
@@ -8,8 +8,8 @@ Subject: Add moo feature
 
 --- a/ip/ip.c
 +++ b/ip/ip.c
-@@ -66,6 +66,20 @@
-         return 0;
+@@ -69,6 +69,20 @@ static int do_help(int argc, char **argv
+       return 0;
  }
  
 +static int do_moo(int argc, char **argv)
@@ -29,9 +29,9 @@ Subject: Add moo feature
  static const struct cmd {
        const char *cmd;
        int (*func)(int argc, char **argv);
-@@ -96,6 +110,7 @@
-       { "netns",      do_netns },
-       { "netconf",    do_ipnetconf },
+@@ -103,6 +117,7 @@ static const struct cmd {
+       { "vrf",        do_ipvrf},
+       { "sr",         do_seg6 },
        { "help",       do_help },
 +      { "moo",        do_moo }, 
        { 0 }
diff --git a/debian/patches/0004-sync-iptables-header.patch b/debian/patches/0004-sync-iptables-header.patch
new file mode 100644 (file)
index 0000000..e8fda6a
--- /dev/null
@@ -0,0 +1,102 @@
+Description: Sync header from iptables
+ The current versions in several suites have the same content:
+  - 1.6.0+snapshot20161117-6 (stretch)
+  - 1.6.1-2 (unstable)
+Bug: https://bugs.debian.og/868059
+Forwarded: not-needed
+Author: Cyril Brulebois <cyril@debamax.com>
+Last-Update: 2017-11-22
+--- a/include/xtables.h
++++ b/include/xtables.h
+@@ -205,9 +205,24 @@ enum xtables_ext_flags {
+       XTABLES_EXT_ALIAS = 1 << 0,
+ };
++struct xt_xlate;
++
++struct xt_xlate_mt_params {
++      const void                      *ip;
++      const struct xt_entry_match     *match;
++      int                             numeric;
++      bool                            escape_quotes;
++};
++
++struct xt_xlate_tg_params {
++      const void                      *ip;
++      const struct xt_entry_target    *target;
++      int                             numeric;
++      bool                            escape_quotes;
++};
++
+ /* Include file for additions: new matches and targets. */
+-struct xtables_match
+-{
++struct xtables_match {
+       /*
+        * ABI/API version this module requires. Must be first member,
+        * as the rest of this struct may be subject to ABI changes.
+@@ -269,6 +284,10 @@ struct xtables_match
+       void (*x6_fcheck)(struct xt_fcheck_call *);
+       const struct xt_option_entry *x6_options;
++      /* Translate iptables to nft */
++      int (*xlate)(struct xt_xlate *xl,
++                   const struct xt_xlate_mt_params *params);
++
+       /* Size of per-extension instance extra "global" scratch space */
+       size_t udata_size;
+@@ -280,8 +299,7 @@ struct xtables_match
+       unsigned int loaded; /* simulate loading so options are merged properly */
+ };
+-struct xtables_target
+-{
++struct xtables_target {
+       /*
+        * ABI/API version this module requires. Must be first member,
+        * as the rest of this struct may be subject to ABI changes.
+@@ -346,6 +364,10 @@ struct xtables_target
+       void (*x6_fcheck)(struct xt_fcheck_call *);
+       const struct xt_option_entry *x6_options;
++      /* Translate iptables to nft */
++      int (*xlate)(struct xt_xlate *xl,
++                   const struct xt_xlate_tg_params *params);
++
+       size_t udata_size;
+       /* Ignore these men behind the curtain: */
+@@ -406,6 +428,17 @@ struct xtables_globals
+ #define XT_GETOPT_TABLEEND {.name = NULL, .has_arg = false}
++/*
++ * enum op-
++ *
++ * For writing clean nftables translations code
++ */
++enum xt_op {
++      XT_OP_EQ,
++      XT_OP_NEQ,
++      XT_OP_MAX,
++};
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -548,6 +581,14 @@ extern void xtables_lmap_free(struct xta
+ extern int xtables_lmap_name2id(const struct xtables_lmap *, const char *);
+ extern const char *xtables_lmap_id2name(const struct xtables_lmap *, int);
++/* xlate infrastructure */
++struct xt_xlate *xt_xlate_alloc(int size);
++void xt_xlate_free(struct xt_xlate *xl);
++void xt_xlate_add(struct xt_xlate *xl, const char *fmt, ...);
++void xt_xlate_add_comment(struct xt_xlate *xl, const char *comment);
++const char *xt_xlate_get_comment(struct xt_xlate *xl);
++const char *xt_xlate_get(struct xt_xlate *xl);
++
+ #ifdef XTABLES_INTERNAL
+ /* Shipped modules rely on this... */
diff --git a/debian/patches/f_u32 b/debian/patches/f_u32
deleted file mode 100644 (file)
index 4505533..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh -e
-## 
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the u32 calculation for 2.6 kernel - by Russell Stuart <russell-debian@stuart.id.au> 
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-@DPATCH@
-diff -Nur iproute-20051007.keep/tc/f_u32.c iproute-20051007/tc/f_u32.c
---- iproute-20051007.keep/tc/f_u32.c   2006-01-12 17:34:37.000000000 +1000
-+++ iproute-20051007/tc/f_u32.c        2006-02-07 17:10:29.000000000 +1000
-@@ -17,6 +17,7 @@
- #include <syslog.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <sys/utsname.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-@@ -874,6 +875,7 @@
-                               htid = (handle&0xFFFFF000);
-               } else if (strcmp(*argv, "sample") == 0) {
-                       __u32 hash;
-+                      struct utsname utsname;
-                       struct {
-                               struct tc_u32_sel sel;
-                               struct tc_u32_key keys[4];
-@@ -889,8 +891,19 @@
-                               return -1;
-                       }
-                       hash = sel2.sel.keys[0].val&sel2.sel.keys[0].mask;
--                      hash ^= hash>>16;
--                      hash ^= hash>>8;
-+                      uname(&utsname);
-+                      if (strncmp(utsname.release, "2.4.", 4) == 0) {
-+                              hash ^= hash>>16;
-+                              hash ^= hash>>8;
-+                      }
-+                      else {
-+                              __u32 mask = sel2.sel.keys[0].mask;
-+                              while (mask && !(mask & 1)) {
-+                                      mask >>= 1;
-+                                      hash >>= 1;
-+                              }
-+                              hash &= 0xFF;
-+                      }
-                       htid = ((hash<<12)&0xFF000)|(htid&0xFFF00000);
-                       sample_ok = 1;
-                       continue;
diff --git a/debian/patches/netlink-buffer.patch b/debian/patches/netlink-buffer.patch
deleted file mode 100644 (file)
index 3287841..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Increase buffer to handle 4096 vlans
- iproute2 (4.1.1-1) unstable; urgency=medium
-Author: Alexandre Derumier <aderumier@odiso.com>
-
---- a/lib/libnetlink.c
-+++ b/lib/libnetlink.c
-@@ -198,7 +198,7 @@ int rtnl_dump_filter_l(struct rtnl_handl
-               .msg_iov = &iov,
-               .msg_iovlen = 1,
-       };
--      char buf[16384];
-+      char buf[49152];
-       int dump_intr = 0;
-       iov.iov_base = buf;
index 960fe25..aca47b3 100644 (file)
@@ -1,2 +1,3 @@
 0001-Add-moo-feature.patch
 0002-txtdocs.patch
+0004-sync-iptables-header.patch
index 4215d0a..e5d7467 100755 (executable)
@@ -12,16 +12,13 @@ else
 endif
 
 %:
-       dh $@ --with=quilt
+       dh $@
 
 override_dh_clean:
        dh_clean
        make distclean
        -rm -f doc/*.txt
 
-override_dh_installexamples:
-       dh_installexamples -p iproute2-doc examples/*
-
 override_dh_shlibdeps:
        dh_shlibdeps -a -Xq_atm.so -Xm_xt.so -Xm_ipt.so
        dh_shlibdeps -a -- -pipmods -dRecommends -e debian/iproute2/usr/lib/tc/m_xt.so -e debian/iproute2/usr/lib/tc/q_atm.so -xlibc6
@@ -30,8 +27,7 @@ override_dh_auto_configure:
        $(CROSS) dh_auto_configure
 
 override_dh_auto_build:
-#      $(MAKE) -C doc all txt
-       $(MAKE) -C doc all
+       $(MAKE) -C doc all txt
        $(MAKE) KERNEL_INCLUDE=./include $(CROSS)
 
 # bump version of the transitional packages...
index e0e01bd..1ca1848 100644 (file)
@@ -1,2 +1,3 @@
-version=3
-http://kernel.org/pub/linux/utils/net/iproute2/iproute2-(.+).tar.xz
+version=4
+opts="pgpsigurlmangle=s%.xz$%.sign%, decompress" \
+       http://kernel.org/pub/linux/utils/net/iproute2/iproute2-(.+).tar.xz
diff --git a/iproute2-4.10.0.orig.tar.gz b/iproute2-4.10.0.orig.tar.gz
deleted file mode 100644 (file)
index 04a68af..0000000
Binary files a/iproute2-4.10.0.orig.tar.gz and /dev/null differ
diff --git a/iproute2-4.13.0.orig.tar.xz b/iproute2-4.13.0.orig.tar.xz
new file mode 100644 (file)
index 0000000..52781af
Binary files /dev/null and b/iproute2-4.13.0.orig.tar.xz differ