packages: libnl/libnl.spec, libnl/libnl-pedantic.patch (NEW) - rel 2; avoid...

arekm arekm at pld-linux.org
Sat Sep 17 09:03:32 CEST 2011 

Author: arekm                        Date: Sat Sep 17 07:03:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; avoid pedantic errors

---- Files affected:
packages/libnl:
   libnl.spec (1.35 -> 1.36) , libnl-pedantic.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libnl/libnl.spec
diff -u packages/libnl/libnl.spec:1.35 packages/libnl/libnl.spec:1.36
--- packages/libnl/libnl.spec:1.35	Fri Sep 16 21:22:39 2011
+++ packages/libnl/libnl.spec	Sat Sep 17 09:03:26 2011
@@ -7,13 +7,14 @@
 Summary(pl.UTF-8):	Biblioteka do obsługi gniazd netlink
 Name:		libnl
 Version:	3.2.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz
 # Source0-md5:	f69506a9d4c5e86d2a41fc55b825af68
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-pedantic.patch
 URL:		http://www.infradead.org/~tgr/libnl/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -103,6 +104,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -227,6 +229,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2011/09/17 07:03:26  arekm
+- rel 2; avoid pedantic errors
+
 Revision 1.35  2011/09/16 19:22:39  qboosh
 - updated to 3.2.0 (new sonames; now fully parallel installable with libnl1)
 - updated link patch

================================================================
Index: packages/libnl/libnl-pedantic.patch
diff -u /dev/null packages/libnl/libnl-pedantic.patch:1.1
--- /dev/null	Sat Sep 17 09:03:32 2011
+++ packages/libnl/libnl-pedantic.patch	Sat Sep 17 09:03:26 2011
@@ -0,0 +1,156 @@
+diff -ur libnl-3.2.0.org/include/netlink/attr.h libnl-3.2.0/include/netlink/attr.h
+--- libnl-3.2.0.org/include/netlink/attr.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/attr.h	2011-09-17 08:56:26.044922372 +0200
+@@ -44,7 +44,7 @@
+ 	NLA_FLAG,	/**< Flag */
+ 	NLA_MSECS,	/**< Micro seconds (64bit) */
+ 	NLA_NESTED,	/**< Nested attributes */
+-	__NLA_TYPE_MAX,
++	__NLA_TYPE_MAX
+ };
+ 
+ #define NLA_TYPE_MAX (__NLA_TYPE_MAX - 1)
+diff -ur libnl-3.2.0.org/include/netlink/cache-api.h libnl-3.2.0/include/netlink/cache-api.h
+--- libnl-3.2.0.org/include/netlink/cache-api.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/cache-api.h	2011-09-17 08:56:41.585298135 +0200
+@@ -115,7 +115,7 @@
+ 	NL_ACT_GET,
+ 	NL_ACT_SET,
+ 	NL_ACT_CHANGE,
+-	__NL_ACT_MAX,
++	__NL_ACT_MAX
+ };
+ 
+ #define NL_ACT_MAX (__NL_ACT_MAX - 1)
+diff -ur libnl-3.2.0.org/include/netlink/handlers.h libnl-3.2.0/include/netlink/handlers.h
+--- libnl-3.2.0.org/include/netlink/handlers.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/handlers.h	2011-09-17 08:57:06.462565163 +0200
+@@ -62,7 +62,7 @@
+ 	/** Skip this message */
+ 	NL_SKIP,
+ 	/** Stop parsing altogether and discard remaining messages */
+-	NL_STOP,
++	NL_STOP
+ };
+ 
+ /**
+@@ -78,7 +78,7 @@
+ 	NL_CB_DEBUG,
+ 	/** Customized handler specified by the user */
+ 	NL_CB_CUSTOM,
+-	__NL_CB_KIND_MAX,
++	__NL_CB_KIND_MAX
+ };
+ 
+ #define NL_CB_KIND_MAX (__NL_CB_KIND_MAX - 1)
+@@ -110,7 +110,7 @@
+ 	NL_CB_SEND_ACK,
+ 	/** Flag NLM_F_DUMP_INTR is set in message */
+ 	NL_CB_DUMP_INTR,
+-	__NL_CB_TYPE_MAX,
++	__NL_CB_TYPE_MAX
+ };
+ 
+ #define NL_CB_TYPE_MAX (__NL_CB_TYPE_MAX - 1)
+diff -ur libnl-3.2.0.org/include/netlink/netfilter/log.h libnl-3.2.0/include/netlink/netfilter/log.h
+--- libnl-3.2.0.org/include/netlink/netfilter/log.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/netfilter/log.h	2011-09-17 08:57:30.113135916 +0200
+@@ -30,12 +30,12 @@
+ enum nfnl_log_copy_mode {
+ 	NFNL_LOG_COPY_NONE,
+ 	NFNL_LOG_COPY_META,
+-	NFNL_LOG_COPY_PACKET,
++	NFNL_LOG_COPY_PACKET
+ };
+ 
+ enum nfnl_log_flags {
+ 	NFNL_LOG_FLAG_SEQ		= 0x1,
+-	NFNL_LOG_FLAG_SEQ_GLOBAL	= 0x2,
++	NFNL_LOG_FLAG_SEQ_GLOBAL	= 0x2
+ };
+ 
+ /* General */
+diff -ur libnl-3.2.0.org/include/netlink/netfilter/queue.h libnl-3.2.0/include/netlink/netfilter/queue.h
+--- libnl-3.2.0.org/include/netlink/netfilter/queue.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/netfilter/queue.h	2011-09-17 08:57:40.600055691 +0200
+@@ -27,7 +27,7 @@
+ enum nfnl_queue_copy_mode {
+ 	NFNL_QUEUE_COPY_NONE,
+ 	NFNL_QUEUE_COPY_META,
+-	NFNL_QUEUE_COPY_PACKET,
++	NFNL_QUEUE_COPY_PACKET
+ };
+ 
+ /* General */
+diff -ur libnl-3.2.0.org/include/netlink/route/link.h libnl-3.2.0/include/netlink/route/link.h
+--- libnl-3.2.0.org/include/netlink/route/link.h	2011-09-09 10:31:41.000000000 +0200
++++ libnl-3.2.0/include/netlink/route/link.h	2011-09-17 08:58:02.583919807 +0200
+@@ -92,7 +92,7 @@
+ 	RTNL_LINK_ICMP6_INERRORS,	/*!< ICMPv6 SNMP InErrors */
+ 	RTNL_LINK_ICMP6_OUTMSGS,	/*!< ICMPv6 SNMP OutMsgs */
+ 	RTNL_LINK_ICMP6_OUTERRORS,	/*!< ICMPv6 SNMP OutErrors */
+-	__RTNL_LINK_STATS_MAX,
++	__RTNL_LINK_STATS_MAX
+ } rtnl_link_stat_id_t;
+ 
+ #define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1)
+diff -ur libnl-3.2.0.org/include/netlink/route/nexthop.h libnl-3.2.0/include/netlink/route/nexthop.h
+--- libnl-3.2.0.org/include/netlink/route/nexthop.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/route/nexthop.h	2011-09-17 08:58:11.357465046 +0200
+@@ -24,7 +24,7 @@
+ enum {
+ 	NH_DUMP_FROM_ONELINE = -2,
+ 	NH_DUMP_FROM_DETAILS = -1,
+-	NH_DUMP_FROM_ENV = 0,
++	NH_DUMP_FROM_ENV = 0
+ 	/* > 0 reserved for nexthop index */
+ };
+ 
+diff -ur libnl-3.2.0.org/include/netlink/route/tc-api.h libnl-3.2.0/include/netlink/route/tc-api.h
+--- libnl-3.2.0.org/include/netlink/route/tc-api.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/route/tc-api.h	2011-09-17 08:58:26.867839643 +0200
+@@ -24,7 +24,7 @@
+ 	RTNL_TC_TYPE_QDISC,
+ 	RTNL_TC_TYPE_CLASS,
+ 	RTNL_TC_TYPE_CLS,
+-	__RTNL_TC_TYPE_MAX,
++	__RTNL_TC_TYPE_MAX
+ };
+ 
+ #define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
+diff -ur libnl-3.2.0.org/include/netlink/route/tc.h libnl-3.2.0/include/netlink/route/tc.h
+--- libnl-3.2.0.org/include/netlink/route/tc.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/route/tc.h	2011-09-17 08:58:36.384736091 +0200
+@@ -63,7 +63,7 @@
+ 	RTNL_TC_DROPS,		/**< Total number of packets dropped */
+ 	RTNL_TC_REQUEUES,	/**< Total number of requeues */
+ 	RTNL_TC_OVERLIMITS,	/**< Total number of overlimits */
+-	__RTNL_TC_STATS_MAX,
++	__RTNL_TC_STATS_MAX
+ };
+ 
+ #define RTNL_TC_STATS_MAX (__RTNL_TC_STATS_MAX - 1)
+diff -ur libnl-3.2.0.org/include/netlink/types.h libnl-3.2.0/include/netlink/types.h
+--- libnl-3.2.0.org/include/netlink/types.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/types.h	2011-09-17 08:59:11.778924754 +0200
+@@ -22,7 +22,7 @@
+ 	NL_DUMP_LINE,		/**< Dump object briefly on one line */
+ 	NL_DUMP_DETAILS,	/**< Dump all attributes but no statistics */
+ 	NL_DUMP_STATS,		/**< Dump all attributes including statistics */
+-	__NL_DUMP_MAX,
++	__NL_DUMP_MAX
+ };
+ #define NL_DUMP_MAX (__NL_DUMP_MAX - 1)
+ 
+diff -ur libnl-3.2.0.org/include/netlink/utils.h libnl-3.2.0/include/netlink/utils.h
+--- libnl-3.2.0.org/include/netlink/utils.h	2011-08-16 16:16:01.000000000 +0200
++++ libnl-3.2.0/include/netlink/utils.h	2011-09-17 08:59:19.612448026 +0200
+@@ -40,7 +40,7 @@
+ 
+ enum {
+ 	NL_BYTE_RATE,
+-	NL_BIT_RATE,
++	NL_BIT_RATE
+ };
+ 
+ /* unit pretty-printing */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libnl/libnl.spec?r1=1.35&r2=1.36&f=u

More information about the pld-cvs-commit mailing list