Author: blues Date: Sun Mar 11 21:41:41 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- 0.4alpha
---- Files affected:
packages/openlldp:
openlldp-bpf.patch (1.1 -> 1.2) , openlldp-noproc.patch (1.1 -> 1.2) ,
openlldp.spec (1.9 -> 1.10) , openlldp-lldp_main.patch (1.1 -> NONE)
(REMOVED), openlldp-min_interfaces.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/openlldp/openlldp-bpf.patch
diff -u packages/openlldp/openlldp-bpf.patch:1.1
packages/openlldp/openlldp-bpf.patch:1.2
--- packages/openlldp/openlldp-bpf.patch:1.1 Sat Nov 24 23:44:22 2007
+++ packages/openlldp/openlldp-bpf.patch Sun Mar 11 22:41:36 2012
@@ -1,8 +1,7 @@
-diff -Nbur openlldp-0.3alpha-orig/src/framehandlers/bpf/bpflib.c
src/framehandlers/bpf/bpflib.c
---- openlldp-0.3alpha-orig/src/framehandlers/bpf/bpflib.c Sun Apr 1
03:10:55 2007
-+++ src/framehandlers/bpf/bpflib.c Thu Jun 28 09:09:15 2007
-@@ -217,7 +217,7 @@
-
+--- ./src/platform/framehandlers/bpf/bpflib.c.org 2012-03-11
22:21:45.215595328 +0100
++++ ./src/platform/framehandlers/bpf/bpflib.c 2012-03-11 22:23:00.465700901
+0100
+@@ -216,7 +216,7 @@ bpf_filter_receive_none(int fd)
+
prog.bf_len = sizeof(insns) / sizeof(struct bpf_insn);
prog.bf_insns = insns;
- return ioctl(fd, BIOCSETF, (u_int)&prog);
@@ -10,24 +9,12 @@
}
/*int
-@@ -236,7 +236,7 @@
-
- prog.bf_len = sizeof(insns) / sizeof(struct bpf_insn);
- prog.bf_insns = insns;
-- return ioctl(fd, BIOCSETF, (u_int)&prog);
-+ return ioctl(fd, BIOCSETF, &prog);
- }*/
+@@ -235,7 +235,7 @@ bpf_filter_receive_none(int fd)
- int bpf_see_sent(int fd, int value) {
-diff -Nbur openlldp-0.3alpha-orig/src/framehandlers/bpf/lldp_bpf_framer.c
src/framehandlers/bpf/lldp_bpf_framer.c
---- openlldp-0.3alpha-orig/src/framehandlers/bpf/lldp_bpf_framer.c Sun Apr
1 06:03:26 2007
-+++ src/framehandlers/bpf/lldp_bpf_framer.c Thu Jun 28 09:09:45 2007
-@@ -101,7 +101,7 @@
- (struct bpf_insn*) &progcodes
- };
+ prog.bf_len = sizeof(insns) / sizeof(struct bpf_insn);
+ prog.bf_insns = insns;
+- return ioctl(fd, BIOCSETF, (u_int)&prog);
++ return ioctl(fd, BIOCSETF, &prog);
+ }*/
-- if(ioctl(lldp_port->socket, BIOCSETF, (u_int)&prog) < 0) {
-+ if(ioctl(lldp_port->socket, BIOCSETF, &prog) < 0) {
- debug_printf(DEBUG_NORMAL, "[Error] (%d) : %s (%s:%d)\n", errno,
strerror(errno), __FUNCTION__, __LINE__);
- bpf_dispose(lldp_port->socket);
- return XENOSOCK;
+ int
================================================================
Index: packages/openlldp/openlldp-noproc.patch
diff -u packages/openlldp/openlldp-noproc.patch:1.1
packages/openlldp/openlldp-noproc.patch:1.2
--- packages/openlldp/openlldp-noproc.patch:1.1 Sat Nov 24 23:03:36 2007
+++ packages/openlldp/openlldp-noproc.patch Sun Mar 11 22:41:36 2012
@@ -1,17 +1,19 @@
---- ./configure.in.org 2007-03-23 04:40:27.000000000 +0100
-+++ ./configure.in 2007-11-24 22:57:18.402258633 +0100
-@@ -94,14 +94,6 @@ else
- FRAMER="generic"
- fi
+--- ./configure.ac.org 2012-03-11 22:14:38.849452928 +0100
++++ ./configure.ac 2012-03-11 22:14:51.270020551 +0100
+@@ -188,16 +188,6 @@ AC_MSG_RESULT($framer)
+ AC_MSG_CHECKING([for platform OS])
+ AC_MSG_RESULT($platform)
--if test $FRAMER = "linux"; then
-- AC_MSG_CHECKING([for procfs support])
-- if test -r /proc/net/dev; then
+-AS_IF([test $framer = "linux"],
+- [ MORELIBS="${MORELIBS} -lm"
+- AC_MSG_CHECKING([for procfs support])
+- if test -r /proc/net/dev; then
- AC_MSG_RESULT(okay)
-- else
+- else
- AC_MSG_ERROR([You must have ProcFS enabled in your kernel!]);
-- fi
--fi
-
- CFLAGS="$GGDBFLAGS $CFLAGS"
-
+- fi],
+- [])
+-
+ AS_IF([test $framer = "generic"],
+ MORELIBS="${MORELIBS} -lwpcap -lpcap -ldnet",
+ [])
================================================================
Index: packages/openlldp/openlldp.spec
diff -u packages/openlldp/openlldp.spec:1.9 packages/openlldp/openlldp.spec:1.10
--- packages/openlldp/openlldp.spec:1.9 Sun Mar 9 19:52:19 2008
+++ packages/openlldp/openlldp.spec Sun Mar 11 22:41:36 2012
@@ -1,25 +1,24 @@
# $Revision$, $Date$
%define subver alpha
-%define rel 2
+%define rel 0.1
Summary: Open Source implementation of IEEE 802.1AB
Summary(pl.UTF-8): Implementacja IEEE 802.1AB z otwartymi źródłami
Name: openlldp
-Version: 0.3
+Version: 0.4
Release: 0.%{subver}.%{rel}
License: GPL
Group: Networking
Source0:
http://dl.sourceforge.net/openlldp/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5: 131abc8c2563d33c4537d1c6dcb5c121
+# Source0-md5: f48ffd632b96246cbf0f5c485dea3b01
Source1: %{name}-lldp.8
Source2: %{name}-lldp.init
Source3: %{name}-lldp.sysconfig
Patch0: %{name}-noproc.patch
Patch1: %{name}-bpf.patch
-Patch2: %{name}-lldp_main.patch
-Patch3: %{name}-min_interfaces.patch
URL: http://openlldp.sourceforge.net/
BuildRequires: autoconf >= 1.5
BuildRequires: automake
+BuildRequires: libconfuse-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -49,8 +48,6 @@
%setup -q -n %{name}-%{version}%{subver}
%patch0 -p1
%patch1 -p1
-%patch2 -p0
-%patch3 -p0
%build
%{__aclocal}
@@ -79,6 +76,7 @@
%attr(754,root,root) /etc/rc.d/init.d/lldpd
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lldpd
%attr(755,root,root) %{_sbindir}/lldpd
+%attr(755,root,root) %{_bindir}/lldpneighbors
%{_mandir}/man8/*.8*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -87,6 +85,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2012/03/11 21:41:36 blues
+- 0.4alpha
+
Revision 1.9 2008/03/09 18:52:19 qboosh
- pl
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openlldp/openlldp-bpf.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openlldp/openlldp-noproc.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openlldp/openlldp.spec?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
