Maybe this will fix the yaml..

This could be tricksy to get right!

.gitlab-ci.yml

@@ -0,0 +1,53 @@
+stages:
+  - package
+  - publish
+
+package:jessie:gem:
+  image: $CI_REGISTRY/docker-images/layers:$DISTRO-ruby
+  stage: package
+  variables:
+    DISTRO: jessie
+    GEMFILE: netlinkrb.gemspec
+  script:
+    - package
+  artifacts:
+    paths:
+    - pkg/
+ 
+package:jessie: &package
+  image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb
+  stage: package
+  variables:
+    DISTRO: jessie
+  script:
+    - package
+  artifacts:
+    paths:
+      - pkg/
+
+package:stretch:
+  <<: *package
+  variables:
+    DISTRO: stretch
+
+package:wheezy:
+  <<: *package
+  variables:
+    DISTRO: wheezy
+
+publish:
+  image: $CI_REGISTRY/docker-images/layers:jessie-publish
+  stage: publish
+  script:
+    - publish
+
+publish:rubygems:
+  image: $CI_REGISTRY/docker-images/layers:$DISTRO-ruby
+  stage: publish
+  script:
+  - mkdir -p ~/.gem
+  - 'echo -e "---\n:rubygems_api_key: ''$RUBYGEMS_API_KEY''\n"  > ~/.gem/credentials'
+  - gem push pkg/jessie/gems/netlinkrb-*.gem
+  only:
+  - master
+  - publish-to-rubygems

.hgignore

@@ -1,6 +1,7 @@
-^debian/liblinux-netlink-ruby(1.8|1.9.1)?$
+^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
+^.pc/
 ^debian/files$
 ^debian/.*\.substvars$
 ^debian/.*\.debhelper.log$

debian/changelog

@@ -1,44 +1,82 @@
-linux-netlink-ruby (0.17-1+squeeze1) oldstable; urgency=medium
+ruby-linux-netlink (0.19-1) stable; urgency=medium
+
+  * The size of size_t is now calculated from the size of an unsigned long
+    int, instead of calling gcc.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 10 May 2017 15:24:42 +0100
+
+ruby-linux-netlink (0.18-2) stable; urgency=medium
+
+  * This package is now architecture independent.
+  * The source format has been removed in favour of using dh --with quilt.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 28 Feb 2017 16:43:43 +0000
+
+ruby-linux-netlink (0.18-1+jessie1) stable; urgency=medium
+
+  * Fixed new massive IP test thing to work with ruby1.8 and also non-root users
+  * Make sure link exists before proceeding with test
+  * Scaled back the massive allocation of IPs from 11 /24s to 4.
+  * Updated linux header constants
+  * Updated to 0.18
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Mon, 17 Oct 2016 13:09:35 +0100
+
+ruby-linux-netlink (0.17-1+jessie1) testing; urgency=medium
 
   * New upstream release
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 22:48:55 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 22:51:34 +0100
 
-linux-netlink-ruby (0.16-1+squeeze1) oldstable; urgency=low
+ruby-linux-netlink (0.16-1+jessie1) testing; urgency=medium
+
+  * Repackaged for jessie
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 17:39:44 +0100
+
+ruby-linux-netlink (0.16-1+wheezy1) stable; urgency=medium
 
   * New upstream release.
 
- -- Patrick J Cherry <patch@dynamo>  Tue, 26 Aug 2014 16:32:44 +0100
+ -- Patrick J Cherry <patch@dynamo>  Tue, 26 Aug 2014 16:33:48 +0100
 
-linux-netlink-ruby (0.15-1+squeeze1) oldstable; urgency=low
+ruby-linux-netlink (0.15-1+wheezy1) stable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 21 Jan 2014 10:02:54 +0000
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 21 Jan 2014 10:01:20 +0000
 
-linux-netlink-ruby (0.14-1+squeeze1) oldstable; urgency=low
+ruby-linux-netlink (0.14-1+wheezy1) stable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 14 Nov 2013 11:59:05 +0000
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 14 Nov 2013 13:37:28 +0000
 
-linux-netlink-ruby (0.13-1+squeeze1) oldstable; urgency=low
+ruby-linux-netlink (0.13-1+wheezy1) stable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:15:43 +0000
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:16:36 +0000
 
-linux-netlink-ruby (0.12-1+squeeze1) oldstable; urgency=low
+ruby-linux-netlink (0.12-1+wheezy1) stable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:28:10 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:26:41 +0100
 
-linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
+ruby-linux-netlink (0.11-1+wheezy2) stable; urgency=low
 
-  * New upstream version.
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Added patch to remove rubygems requires.
+  * Renamed source package to fit in with the new guidelines.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 13:52:09 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 14:16:30 +0100
+
+linux-netlink-ruby (0.11-1+wheezy1) stable; urgency=low
+
+  * New upstream version, repackaged for wheezy.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 14:16:05 +0100
 
 linux-netlink-ruby (0.10-6) stable; urgency=low
 

debian/control

@@ -1,39 +1,18 @@
-Source: linux-netlink-ruby
+Source: ruby-linux-netlink
 Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends:  debhelper (>= 7), cdbs, ruby1.8, ruby1.9.1, ruby-pkg-tools, rake
+Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi, quilt
 Standards-Version: 3.8.0
+XS-Ruby-Versions: all 
 
-Package: liblinux-netlink-ruby
+Package: ruby-linux-netlink
 Architecture: all
-Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
+Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
+Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
+XB-Ruby-Versions: ${ruby:Versions}
 Description: Netlink socket library for Ruby
  This library provides an API for using a Linux Netlink socket, for doing
  things like manipulating IP interfaces and routes programmatically, and
  capturing packets from ULOG.
- .
- This is the metapackage for all versions of Ruby.
-
-Package: liblinux-netlink-ruby1.8
-Architecture: any
-Depends: ruby1.8 (>= 1.8.7), libffi-ruby1.8, ${misc:Depends}
-Description: Netlink socket library for Ruby 1.8
- This library provides an API for using a Linux Netlink socket, for doing
- things like manipulating IP interfaces and routes programmatically, and
- capturing packets from ULOG.
- .
- This is the version for Ruby 1.8.7.
- 
-
-Package: liblinux-netlink-ruby1.9.1
-Architecture: any
-Depends: ruby1.9.1, libffi-ruby1.9.1, ${misc:Depends}
-Description: Netlink socket library for Ruby 1.9.1
- This library provides an API for using a Linux Netlink socket, for doing
- things like manipulating IP interfaces and routes programmatically, and
- capturing packets from ULOG.
- .
- This is the version for Ruby 1.9.1.
-

debian/liblinux-netlink-ruby1.9.1.examples

@@ -1 +0,0 @@
-examples/*

debian/patches/remove-rubygems-requirements

@@ -0,0 +1,32 @@
+Removed "require rubygems" from everywhere.
+--- a/lib/linux/iptables.rb
++++ b/lib/linux/iptables.rb
+@@ -1,11 +1,6 @@
+ require 'socket'
+ require 'linux/constants'
+-
+-begin
+-  require 'ffi'
+-rescue LoadError
+-  require('rubygems') ? retry : raise
+-end
++require 'ffi'
+ 
+ 
+ # Good things about FFI::Struct:
+--- a/lib/linux/sendmsg.rb
++++ b/lib/linux/sendmsg.rb
+@@ -1,12 +1,7 @@
+ # Patchup to add Socket#sendmsg and Socket#recvmsg for ruby 1.8
+ 
+ if BasicSocket.instance_methods.grep(/^sendmsg$/).empty?
+-  begin
+-    require 'ffi'
+-  rescue LoadError
+-    require('rubygems') ? retry : raise
+-  end
+-
++  require 'ffi'
+     
+   class BasicSocket
+     module FFIExt

debian/patches/series

@@ -0,0 +1 @@
+remove-rubygems-requirements

debian/ruby-test-files.yaml

@@ -0,0 +1,2 @@
+---
+- test/t_route.rb

debian/rules

@@ -1,11 +1,23 @@
 #!/usr/bin/make -f
 #
+# export DH_VERBOSE=1
+#
+# Uncomment to ignore all test failures (but the tests will run anyway)
+# export DH_RUBY_IGNORE_TESTS=all
+#
+# Uncomment to ignore some test failures (but the tests will run anyway).
+# Valid values:
+# export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+#
+# If you need to specify the .gemspec (eg there is more than one)
+# export DH_RUBY_GEMSPEC=gem.gemspec
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
-include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+	dh $@ --buildsystem=ruby --with ruby --with quilt
 
-makebuilddir::
+override_dh_auto_build-arch:
 	rake lib/linux/c_struct_sizeof_size_t.rb
 
-clean::
+override_dh_auto_clean:
 	rake clean
+

lib/linux/c_struct.rb

@@ -82,8 +82,8 @@ class CStruct
   begin
     require 'linux/c_struct_sizeof_size_t.rb'
   rescue LoadError
-    warn "Falling back to gcc to determine sizeof size_t." if $VERBOSE
+    warn "netlinkrb: Assuming size_t is a long unsigned int." if $DEBUG
-    SIZEOF_SIZE_T = Integer(`echo __SIZEOF_SIZE_T__ | gcc -E -P -`) rescue 1.size
+    SIZEOF_SIZE_T = [0].pack("L_").bytesize
   end
 
   define_type :size_t,

lib/linux/constants.rb

@@ -36,6 +36,7 @@ module Linux
   NLM_F_ACK    = 4
   NLM_F_ECHO    = 8
   NLM_F_DUMP_INTR = 16
+  NLM_F_DUMP_FILTERED = 32
   NLM_F_ROOT    = 0x100
   NLM_F_MATCH    = 0x200
   NLM_F_ATOMIC    = 0x400
@@ -53,6 +54,8 @@ module Linux
   NLMSG_DONE    = 0x3
   NLMSG_OVERRUN    = 0x4
 
+  NLMSG_MIN_TYPE = 0x10
+
   NETLINK_ADD_MEMBERSHIP  = 1
   NETLINK_DROP_MEMBERSHIP  = 2
   NETLINK_PKTINFO    = 3
@@ -60,6 +63,9 @@ module Linux
   NETLINK_NO_ENOBUFS    = 5
   NETLINK_RX_RING  = 6
   NETLINK_TX_RING = 7
+  NETLINK_LISTEN_ALL_NSID = 8
+  NETLINK_LIST_MEMBERSHIPS = 9
+  NETLINK_CAP_ACK = 10
 
   NETLINK_UNCONNECTED    = 0
   NETLINK_CONNECTED    = 1
@@ -71,6 +77,7 @@ module Linux
   NLA_ALIGNTO      = 4  # same on i686 and x86_64
 
   # from linux/rtnetlink.h.
+  RTM_BASE      = 16
   RTM_NEWLINK    = 16
   RTM_DELLINK    = 17
   RTM_GETLINK    = 18
@@ -133,6 +140,12 @@ module Linux
   RTM_DELMDB = 85
   RTM_GETMDB = 86
 
+  RTM_NEWNSID = 88
+  RTM_DELNSID = 89
+  RTM_GETNSID = 90
+
+  RTM_NEWSTATS = 92
+  RTM_GETSTATS = 94
 
   # RT#type
   RTN_UNSPEC    = 0
@@ -164,6 +177,7 @@ module Linux
   RTPROT_NTK    = 15
   RTPROT_DHCP    = 16
   RTPROT_MROUTED = 17
+  RTPROT_BABEL = 42
 
   # RT#scope, IFAddr#scope
   RT_SCOPE_UNIVERSE  = 0
@@ -177,6 +191,7 @@ module Linux
   RTM_F_CLONED    = 0x200
   RTM_F_EQUALIZE  = 0x400
   RTM_F_PREFIX    = 0x800
+  RTM_F_LOOKUP_TABLE = 0x1000
 
   # RT#table (reserved values)
   RT_TABLE_UNSPEC  = 0
@@ -201,11 +216,21 @@ module Linux
   RTA_TABLE    = 15
   RTA_MARK    = 16
   RTA_MFC_STATS = 17
+  RTA_VIA = 18
+  RTA_NEWDST = 19
+  RTA_PREF = 20
+  RTA_ENCAP_TYPE = 21
+  RTA_ENCAP = 22
+  RTA_EXPIRES = 23
+  RTA_PAD = 24
 
   # Keys for RT#nh_flags
   RTNH_F_DEAD      = 1    # Nexthop is dead (used by multipath)
   RTNH_F_PERVASIVE  = 2  # Do recursive gateway lookup
   RTNH_F_ONLINK    = 4   # Gateway is forced on link
+  RTNH_F_OFFLOAD   = 8   # offloaded route
+  RTNH_F_LINKDOWN  = 16  # carrier-down on nexthop
+
 
   # Keys for RT#metrics
   RTAX_UNSPEC    = 0
@@ -224,6 +249,7 @@ module Linux
   RTAX_RTO_MIN    = 13
   RTAX_INITRWND    = 14
   RTAX_QUICKACK   = 15
+  RTAX_CC_ALGO    = 16
 
   # from linux/if_link.h
   IFLA_UNSPEC    = 0
@@ -261,6 +287,14 @@ module Linux
   IFLA_NUM_RX_QUEUES    = 32
   IFLA_CARRIER          = 33
   IFLA_PHYS_PORT_ID  = 34
+  IFLA_CARRIER_CHANGES = 35
+  IFLA_PHYS_SWITCH_ID = 36
+  IFLA_LINK_NETNSID = 37
+  IFLA_PHYS_PORT_NAME = 38
+  IFLA_PROTO_DOWN = 39
+  IFLA_GSO_MAX_SEGS = 40
+  IFLA_GSO_MAX_SIZE = 41
+  IFLA_PAD = 42
 
   BRIDGE_MODE_UNSPEC = 0
   BRIDGE_MODE_HAIRPIN = 1
@@ -275,12 +309,30 @@ module Linux
   IFLA_BRPORT_FAST_LEAVE    = 7 # multicast fast leave
   IFLA_BRPORT_LEARNING      = 8 # mac learning
   IFLA_BRPORT_UNICAST_FLOOD = 9 # flood unicast traffic
+  IFLA_BRPORT_PROXYARP      = 10 # proxy ARP
+  IFLA_BRPORT_LEARNING_SYNC = 11 # mac learning sync from device
+  IFLA_BRPORT_PROXYARP_WIFI = 12 # proxy ARP for Wi-Fi
+  IFLA_BRPORT_ROOT_ID       = 13 # designated root
+  IFLA_BRPORT_BRIDGE_ID     = 14 # designated bridge
+  IFLA_BRPORT_DESIGNATED_PORT = 15
+  IFLA_BRPORT_DESIGNATED_COST = 16
+  IFLA_BRPORT_ID = 17
+  IFLA_BRPORT_NO = 18
+  IFLA_BRPORT_TOPOLOGY_CHANGE_ACK = 19
+  IFLA_BRPORT_CONFIG_PENDING = 20
+  IFLA_BRPORT_MESSAGE_AGE_TIMER = 21
+  IFLA_BRPORT_FORWARD_DELAY_TIMER = 22
+  IFLA_BRPORT_HOLD_TIMER = 23
+  IFLA_BRPORT_FLUSH = 24
+  IFLA_BRPORT_MULTICAST_ROUTER = 25
+  IFLA_BRPORT_PAD = 26
 
   IFLA_INFO_UNSPEC  = 0
   IFLA_INFO_KIND  = 1  # "vlan", "gre" etc
   IFLA_INFO_DATA  = 2  # packed rtattrs specific to type, e.g. vlan
   IFLA_INFO_XSTATS  = 3
 
+
   # INFO_DATA for INFO_KIND == "vlan"
   IFLA_VLAN_UNSPEC  = 0
   IFLA_VLAN_ID    = 1  # ushort
@@ -295,11 +347,16 @@ module Linux
   IFLA_MACVLAN_UNSPEC  = 0
   IFLA_MACVLAN_MODE  = 1
   IFLA_MACVLAN_FLAGS  = 2
+  IFLA_MACVLAN_MACADDR_MODE = 3
+  IFLA_MACVLAN_MACADDR = 4
+  IFLA_MACVLAN_MACADDR_DATA = 5
+  IFLA_MACVLAN_MACADDR_COUNT = 6
 
-  MACVLAN_MODE_PRIVATE	= 1
+  MACVLAN_MODE_PRIVATE  = 1 # don't talk to other macvlans
-  MACVLAN_MODE_VEPA	= 2
+  MACVLAN_MODE_VEPA  = 2 # talk to other ports through ext bridge
-  MACVLAN_MODE_BRIDGE	= 4
+  MACVLAN_MODE_BRIDGE  = 4 # talk to bridge ports directly
-  MACVLAN_MODE_PASSTHRU	= 8
+  MACVLAN_MODE_PASSTHRU  = 8 # take over the underlying device
+  MACVLAN_MODE_SOURCE = 16 # use source MAC address list to assign
 
   # TODO: VXLAN and VF stuff is missing here
 
@@ -331,6 +388,8 @@ module Linux
   IFA_F_PERMANENT      = 0x80
   IFA_F_MANAGETEMPADDR = 0x100
   IFA_F_NOPREFIXROUTE  = 0x200
+  IFA_F_MCAUTOJOIN     = 0x400
+  IFA_F_STABLE_PRIVACY = 0x800
 
   # from linux/if_arp.h - selected subset
   ARPHRD_NETROM    = 0
@@ -392,8 +451,10 @@ module Linux
   NF_INET_NUMHOOKS  = 5
 
   NFPROTO_UNSPEC  = 0
+  NFPROTO_INET    = 1
   NFPROTO_IPV4    = 2
   NFPROTO_ARP    = 3
+  NFPROTO_NETDEV = 5
   NFPROTO_BRIDGE  = 7
   NFPROTO_IPV6    = 10
   NFPROTO_DECNET  = 12

netlinkrb.gemspec

@@ -5,7 +5,7 @@ $:.unshift lib unless $:.include? lib
 
 Gem::Specification.new do |s|
   s.name = "netlinkrb"
-  s.version = "0.17"
+  s.version = "0.18"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Brian Candler", "Matthew Bloch", "Patrick Cherry", "Alex Young", "Nicholas Thomas"]
   s.email = ["matthew@bytemark.co.uk"]

test/t_route.rb

@@ -42,8 +42,12 @@ class TestAddr < Test::Unit::TestCase
 
     test "massively parallel IP address addition" do
       @ifname = create_test_interface
+      return if @ifname.nil?
       
-      ips = (10..20).map {|y| (1..254).map {|z| "10.100.#{y}.#{z}" } }.flatten.compact
+      link = @ip.link.list.find{|x| x.ifname == @ifname} 
+      return if link.nil?
+
+      ips = (10..13).map {|y| (1..254).map {|z| "10.100.#{y}.#{z}" } }.flatten.compact
 
       threads = ips.map {|ip|
         Thread.new {
@@ -55,7 +59,8 @@ class TestAddr < Test::Unit::TestCase
         }
       }
 
-      threads.map(&:join)
+      threads.map{|t| t.join }
+
       created = @ip.addr.list(:index => @ifname, :family => Socket::AF_INET).
         map {|ifaddr| ifaddr.address.to_s }