Added tag 0.14 for changeset b75625aab29e

.hgignore

@@ -1,7 +1,3 @@
-^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
-^.pc/
+^debian/$
-^debian/files$
-^debian/.*\.substvars$
-^debian/.*\.debhelper.log$

debian/changelog

@@ -1,63 +0,0 @@
-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:16:36 +0000
-
-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:26:41 +0100
-
-ruby-linux-netlink (0.11-1+wheezy2) stable; urgency=low
-
-  * 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 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
-
-  * Add ip rule support
-
- -- Nick Thomas <nick@bytemark.co.uk>  Thu,  5 Jul 2012 15:19:42 +0100
-
-linux-netlink-ruby (0.10-5) stable; urgency=low
-
-  * Updated rattr constants to work with linux 3.2.
-  * Updated link handler to have new rattrs. 
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Mon, 11 Jun 2012 10:53:37 +0100
-
-linux-netlink-ruby (0.10-4) unstable; urgency=low
-
-  * Removed dependency on gcc, in favour of having arch-dependent packages
-    which rely on build-time ascertation of sizeof size_t.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 24 Jan 2012 15:56:46 +0000
-
-linux-netlink-ruby (0.10-3) unstable; urgency=low
-
-  * Updated version number to cover the previous changes.
-
- -- Steve Kemp <steve@bytemark.co.uk>  Thu, 12 Jan 2012 12:00:21 +0000
-
-linux-netlink-ruby (0.10-2) unstable; urgency=low
-
-  * Added NlSocket.open and scope handling.
-
- -- Matthew Bloch <matthew@bytemark.co.uk>  Wed, 18 May 2011 15:27:00 +0100
-
-linux-netlink-ruby (0.10-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 May 2011 17:17:45 +0100

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,18 +0,0 @@
-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), gem2deb, rake, ruby-ffi
-Standards-Version: 3.8.0
-XS-Ruby-Versions: all 
-
-Package: ruby-linux-netlink
-Architecture: any
-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.

debian/copyright

@@ -1,20 +0,0 @@
-Ruby Netlink
-============
-
-Copyright (c) 2011 Bytemark Computer Consulting Ltd
-
-Licence:
-
-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 2 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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in ‘/usr/share/common-licenses/GPL’ or in the dpkg
-source as the file ‘COPYING’

debian/patches/remove-rubygems-requirements

@@ -1,32 +0,0 @@
-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

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

debian/ruby-linux-netlink.examples

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

debian/ruby-test-files.yaml

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

debian/rules

@@ -1,23 +0,0 @@
-#!/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
-
-%:
-	dh $@ --buildsystem=ruby --with ruby
-
-override_dh_auto_build-arch:
-	rake lib/linux/c_struct_sizeof_size_t.rb
-
-override_dh_auto_clean:
-	rake clean
-

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

lib/linux/netlink/route/link_handler.rb

@@ -122,6 +122,7 @@ module Netlink
       :unpack => lambda { |str,obj| VlanFlags.parse(str) }
     rtattr :egress_qos, IFLA_VLAN_EGRESS_QOS
     rtattr :ingress_qos, IFLA_VLAN_INGRESS_QOS
+    rtattr :protocol, IFLA_VLAN_PROTOCOL, :ushort
   end
 
   module Route

lib/linux/netlink/route/vlan_handler.rb

@@ -8,12 +8,12 @@ module Netlink
       def clear_cache
         # No cache
       end
-      
+
       def list(filter={}, &blk)
         @rtsocket.link.list(filter.merge(:kind=>"vlan"))
       end
       alias :each :list
-            
+
       # Higher-level API to manipulate VLAN interface.
       #    nl.vlans.add(
       #      :link=>"lo",
@@ -24,15 +24,15 @@ module Netlink
       def add(opt)
         @rtsocket.link.add(vlan_options(opt))
       end
-      
+
       def change(opt)
         @rtsocket.link.change(vlan_options(opt))
       end
-      
+
       def replace(opt)
         @rtsocket.link.replace(vlan_options(opt))
       end
-      
+
       # Delete vlan given :link and :vlan_id. If you want to delete
       # by :index then call link.delete instead.
       def delete(opt)
@@ -59,6 +59,7 @@ module Netlink
         end
         li.data.egress_qos = opt.delete(:egress_qos) if opt.has_key?(:egress_qos)
         li.data.ingress_qos = opt.delete(:ingress_qos) if opt.has_key?(:ingress_qos)
+        li.data.protocol = opt.delete(:protocol) if opt.has_key?(:protocol)
         opt
       end
     end