From dfce7cf2ea2cbd0f0aaddeb2a7b08dbdc3185395 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Dec 28 2010 21:02:29 +0000
Subject: Upgrade to 1.1.5


---

diff --git a/.gitignore b/.gitignore
index 2acf1f8..739213f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-libnet-1.1.4.tar.gz
+libnet-1.1.5.tar.gz
diff --git a/libnet-1.1.4-capability.patch b/libnet-1.1.4-capability.patch
deleted file mode 100644
index a29dce2..0000000
--- a/libnet-1.1.4-capability.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for libnet >= 1.1.4, which backports
-capability support instead of explicitly checking for UID 0. Further information can be
-found at the following links:
-
- - https://bugzilla.redhat.com/show_bug.cgi?id=589770
- - http://github.com/sam-github/libnet/commit/671742244c20804c9e935326e3649dac3382f17a
-
---- libnet-1.1.4/src/libnet_init.c			2009-06-05 02:31:44.000000000 +0200
-+++ libnet-1.1.4/src/libnet_init.c.capability		2010-07-09 22:57:10.000000000 +0200
-@@ -44,14 +44,7 @@
- {
-     libnet_t *l = NULL;
- 
--#if !defined(__WIN32__)
--    if (getuid() && geteuid())
--    {
--        snprintf(err_buf, LIBNET_ERRBUF_SIZE,
--                "%s(): UID or EUID of 0 required\n", __func__);
--        goto bad;
--    }
--#else
-+#if defined(__WIN32__)
-     WSADATA wsaData;
- 
-     if ((WSAStartup(0x0202, &wsaData)) != 0)
---- libnet-1.1.4/src/libnet_link_linux.c		2009-06-05 02:31:44.000000000 +0200
-+++ libnet-1.1.4/src/libnet_link_linux.c.capability	2010-07-09 22:58:33.000000000 +0200
-@@ -90,8 +90,15 @@
- 
-     if (ioctl(l->fd, SIOCGIFHWADDR, &ifr) < 0 )
-     {
--        snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
--                "SIOCGIFHWADDR: %s", strerror(errno));
-+        if (errno == EPERM) {
-+            snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
-+                     "%s(): UID/EUID 0 or capability CAP_NET_RAW required",
-+                     __func__);
-+
-+        } else {
-+            snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
-+                     "socket: %s", strerror(errno));
-+        }
-         goto bad;
-     }
- 
diff --git a/libnet.spec b/libnet.spec
index a8a2508..bc4b891 100644
--- a/libnet.spec
+++ b/libnet.spec
@@ -1,12 +1,11 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
-Version:	1.1.4
-Release:	4%{?dist}
+Version:	1.1.5
+Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/
 Source:		http://downloads.sourceforge.net/libnet-dev/%{name}-%{version}.tar.gz
-Patch0:		libnet-1.1.4-capability.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -30,7 +29,6 @@ and sample test code for more detailed information.
 
 %prep
 %setup -q
-%patch0 -p1 -b .capability
 
 # Keep the sample directory untouched by make
 rm -rf __dist_sample
@@ -86,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Tue Dec 28 2010 Robert Scheck <robert@fedoraproject.org> 1.1.5-1
+- Upgrade to 1.1.5
+
 * Fri Jul 09 2010 Robert Scheck <robert@fedoraproject.org> 1.1.4-4
 - Added patch for capability support rather UID check (#589770)
 
diff --git a/sources b/sources
index 0366636..76b7f16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5e06418a89cc4209f677a776a798fd9  libnet-1.1.4.tar.gz
+a9bc1d75a610efcfee200d3e28d8eb8f  libnet-1.1.5.tar.gz