From bd20f7bbf6a0096da4c68df8d8c41030216d6c71 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 13 Sep 2013 10:05:55 -0500 Subject: [PATCH 1/3] Fix pc file path and ndptool -v argument --- 0001-ndptool-fix-v-argument.patch | 27 +++++++++++++++++++++++++++ 0002-fix-cflags-path-in-pc-file.patch | 23 +++++++++++++++++++++++ libndp.spec | 11 ++++++++++- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-ndptool-fix-v-argument.patch create mode 100644 0002-fix-cflags-path-in-pc-file.patch diff --git a/0001-ndptool-fix-v-argument.patch b/0001-ndptool-fix-v-argument.patch new file mode 100644 index 0000000..b5d46bc --- /dev/null +++ b/0001-ndptool-fix-v-argument.patch @@ -0,0 +1,27 @@ +From 776fb96b15a2c0c2b6fc5398939dce10630e1256 Mon Sep 17 00:00:00 2001 +From: Yanko Kaneti +Date: Thu, 8 Aug 2013 12:40:42 +0300 +Subject: [PATCH 1/2] ndptool: fix -v argument + +Signed-off-by: Yanko Kaneti +Signed-off-by: Jiri Pirko +--- + utils/ndptool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/ndptool.c b/utils/ndptool.c +index d0764ce..120ffdc 100644 +--- a/utils/ndptool.c ++++ b/utils/ndptool.c +@@ -397,7 +397,7 @@ int main(int argc, char **argv) + int err; + int res = EXIT_FAILURE; + +- while ((opt = getopt_long(argc, argv, "hp:i:t:", ++ while ((opt = getopt_long(argc, argv, "hvt:i:", + long_options, NULL)) >= 0) { + + switch(opt) { +-- +1.8.3.1 + diff --git a/0002-fix-cflags-path-in-pc-file.patch b/0002-fix-cflags-path-in-pc-file.patch new file mode 100644 index 0000000..e757add --- /dev/null +++ b/0002-fix-cflags-path-in-pc-file.patch @@ -0,0 +1,23 @@ +From d2247aae11c80a4e3c0084d9294c858bdcaf26c7 Mon Sep 17 00:00:00 2001 +From: Jiri Pirko +Date: Fri, 16 Aug 2013 11:21:14 +0200 +Subject: [PATCH 2/2] fix cflags path in pc file + +Signed-off-by: Jiri Pirko +--- + libndp/libndp.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libndp/libndp.pc.in b/libndp/libndp.pc.in +index f486edf..62d630d 100644 +--- a/libndp/libndp.pc.in ++++ b/libndp/libndp.pc.in +@@ -7,4 +7,4 @@ Name: libndp + Description: Neighbour discovery library. + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lndp +-Cflags: -I${includedir}/ndp.h ++Cflags: -I${includedir} +-- +1.8.3.1 + diff --git a/libndp.spec b/libndp.spec index e4f3dd8..035adf6 100644 --- a/libndp.spec +++ b/libndp.spec @@ -1,12 +1,15 @@ Name: libndp Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for Neighbor Discovery Protocol Group: System Environment/Libraries License: LGPLv2+ URL: http://www.libndp.org/ Source: http://www.libndp.org/files/libndp-%{version}.tar.gz +Patch0: 0001-ndptool-fix-v-argument.patch +Patch1: 0002-fix-cflags-path-in-pc-file.patch + %description This package contains a library which provides a wrapper for IPv6 Neighbor Discovery Protocol. It also provides a tool @@ -23,6 +26,8 @@ necessary for developing programs using libndp. %prep %setup -q +%patch0 -p1 -b .ndptool-v +%patch1 -p1 -b .fix-pc-file %build %configure --disable-static @@ -48,6 +53,10 @@ find $RPM_BUILD_ROOT -name \*.la -delete %{_libdir}/pkgconfig/*.pc %changelog +* Fri Sep 13 2013 Dan Williams - 1.0-2 +- Fix .pc file includes path +- Fix ndptool -v argument + * Thu Aug 08 2013 Jiri Pirko - 1.0-1 - Update to 1.0 From 4d90d8a4bdd47c2ec3ae36651606c80498315a35 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 4 Oct 2013 14:25:15 +0200 Subject: [PATCH 2/3] Update to 1.1 --- 0001-ndptool-fix-v-argument.patch | 27 --------------------------- 0002-fix-cflags-path-in-pc-file.patch | 23 ----------------------- libndp.spec | 12 +++++------- sources | 2 +- 4 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 0001-ndptool-fix-v-argument.patch delete mode 100644 0002-fix-cflags-path-in-pc-file.patch diff --git a/0001-ndptool-fix-v-argument.patch b/0001-ndptool-fix-v-argument.patch deleted file mode 100644 index b5d46bc..0000000 --- a/0001-ndptool-fix-v-argument.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 776fb96b15a2c0c2b6fc5398939dce10630e1256 Mon Sep 17 00:00:00 2001 -From: Yanko Kaneti -Date: Thu, 8 Aug 2013 12:40:42 +0300 -Subject: [PATCH 1/2] ndptool: fix -v argument - -Signed-off-by: Yanko Kaneti -Signed-off-by: Jiri Pirko ---- - utils/ndptool.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/ndptool.c b/utils/ndptool.c -index d0764ce..120ffdc 100644 ---- a/utils/ndptool.c -+++ b/utils/ndptool.c -@@ -397,7 +397,7 @@ int main(int argc, char **argv) - int err; - int res = EXIT_FAILURE; - -- while ((opt = getopt_long(argc, argv, "hp:i:t:", -+ while ((opt = getopt_long(argc, argv, "hvt:i:", - long_options, NULL)) >= 0) { - - switch(opt) { --- -1.8.3.1 - diff --git a/0002-fix-cflags-path-in-pc-file.patch b/0002-fix-cflags-path-in-pc-file.patch deleted file mode 100644 index e757add..0000000 --- a/0002-fix-cflags-path-in-pc-file.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d2247aae11c80a4e3c0084d9294c858bdcaf26c7 Mon Sep 17 00:00:00 2001 -From: Jiri Pirko -Date: Fri, 16 Aug 2013 11:21:14 +0200 -Subject: [PATCH 2/2] fix cflags path in pc file - -Signed-off-by: Jiri Pirko ---- - libndp/libndp.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libndp/libndp.pc.in b/libndp/libndp.pc.in -index f486edf..62d630d 100644 ---- a/libndp/libndp.pc.in -+++ b/libndp/libndp.pc.in -@@ -7,4 +7,4 @@ Name: libndp - Description: Neighbour discovery library. - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lndp --Cflags: -I${includedir}/ndp.h -+Cflags: -I${includedir} --- -1.8.3.1 - diff --git a/libndp.spec b/libndp.spec index 035adf6..c014721 100644 --- a/libndp.spec +++ b/libndp.spec @@ -1,15 +1,12 @@ Name: libndp -Version: 1.0 -Release: 2%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Library for Neighbor Discovery Protocol Group: System Environment/Libraries License: LGPLv2+ URL: http://www.libndp.org/ Source: http://www.libndp.org/files/libndp-%{version}.tar.gz -Patch0: 0001-ndptool-fix-v-argument.patch -Patch1: 0002-fix-cflags-path-in-pc-file.patch - %description This package contains a library which provides a wrapper for IPv6 Neighbor Discovery Protocol. It also provides a tool @@ -26,8 +23,6 @@ necessary for developing programs using libndp. %prep %setup -q -%patch0 -p1 -b .ndptool-v -%patch1 -p1 -b .fix-pc-file %build %configure --disable-static @@ -53,6 +48,9 @@ find $RPM_BUILD_ROOT -name \*.la -delete %{_libdir}/pkgconfig/*.pc %changelog +* Fri Oct 04 2013 Jiri Pirko - 1.1-1 +- Update to 1.1 + * Fri Sep 13 2013 Dan Williams - 1.0-2 - Fix .pc file includes path - Fix ndptool -v argument diff --git a/sources b/sources index 12fbe31..201abd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b79429fa6e26994c1aef33d7115f7b10 libndp-1.0.tar.gz +4dba93ec253d673b1398c08f3b680462 libndp-1.1.tar.gz From 562fae8121aceb1431c1edd2e93680517b349174 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Tue, 15 Oct 2013 14:39:45 +0200 Subject: [PATCH 3/3] Update to 1.2 - libndp: silently ignore packets with optlen 0 - libndp: fix processing for larger options - libndp: do not fail on receiving non-ndp packets --- .gitignore | 1 + libndp.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 384e4c4..bf5c222 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libndp-20130504gitca3c399.tar.gz /libndp-20130607git39e1f53.tar.gz /libndp-1.0.tar.gz +/libndp-1.2.tar.gz diff --git a/libndp.spec b/libndp.spec index c014721..ef1e556 100644 --- a/libndp.spec +++ b/libndp.spec @@ -1,5 +1,5 @@ Name: libndp -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: Library for Neighbor Discovery Protocol Group: System Environment/Libraries @@ -48,6 +48,12 @@ find $RPM_BUILD_ROOT -name \*.la -delete %{_libdir}/pkgconfig/*.pc %changelog +* Tue Oct 15 2013 Jiri Pirko - 1.2-1 +- Update to 1.2 +- libndp: silently ignore packets with optlen 0 +- libndp: fix processing for larger options +- libndp: do not fail on receiving non-ndp packets + * Fri Oct 04 2013 Jiri Pirko - 1.1-1 - Update to 1.1 diff --git a/sources b/sources index 201abd6..0c8e8f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dba93ec253d673b1398c08f3b680462 libndp-1.1.tar.gz +f94d2a72bd3e2c58bf2dfd827c9681a8 libndp-1.2.tar.gz