rpms/libnl/F-7 libnl-1.0-pre8-more-build-output.patch, NONE, 1.1 libnl-1.0-pre8-use-vasprintf-retval.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libnl-1.0-pre5-debuginfo.patch, 1.1, 1.2 libnl-1.0-pre5-static.patch, 1.1, 1.2 libnl.spec, 1.18, 1.19 sources, 1.6, 1.7 libnl-1.0-install-no-root.patch, 1.1, NONE libnl-1.0-pre5-__u64_x86_64.patch, 1.1, NONE libnl-1.0-pre5-nl_recv.patch, 1.1, NONE libnl-64bit.patch, 1.2, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Tue Feb 12 04:24:58 UTC 2008
Author: dcbw
Update of /cvs/extras/rpms/libnl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20443
Modified Files:
.cvsignore libnl-1.0-pre5-debuginfo.patch
libnl-1.0-pre5-static.patch libnl.spec sources
Added Files:
libnl-1.0-pre8-more-build-output.patch
libnl-1.0-pre8-use-vasprintf-retval.patch
Removed Files:
libnl-1.0-install-no-root.patch
libnl-1.0-pre5-__u64_x86_64.patch libnl-1.0-pre5-nl_recv.patch
libnl-64bit.patch
Log Message:
Update to 1.1
libnl-1.0-pre8-more-build-output.patch:
--- NEW FILE libnl-1.0-pre8-more-build-output.patch ---
diff -up libnl-1.0-pre8/src/Makefile.more-build-output libnl-1.0-pre8/src/Makefile
--- libnl-1.0-pre8/src/Makefile.more-build-output 2007-12-03 14:25:29.000000000 -0500
+++ libnl-1.0-pre8/src/Makefile 2007-12-03 14:25:38.000000000 -0500
@@ -22,19 +22,15 @@ all: $(TOOLS)
$(TOOLS): utils.o
nl-%: nl-%.c
- @echo " LD $@"; \
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
genl-%: genl-%.c
- @echo " LD $@"; \
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
nf-%: nf-%.c
- @echo " LD $@"; \
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
clean:
- @echo " CLEAN src"; \
rm -f $(TOOLS) utils.o
distclean: clean
diff -up libnl-1.0-pre8/Makefile.rules.more-build-output libnl-1.0-pre8/Makefile.rules
--- libnl-1.0-pre8/Makefile.rules.more-build-output 2007-11-21 12:25:39.000000000 -0500
+++ libnl-1.0-pre8/Makefile.rules 2007-12-03 14:24:22.000000000 -0500
@@ -13,11 +13,9 @@
.SUFFIXES: .d .c
%.o: %.c
- @echo " CC $<"; \
$(CC) $(CFLAGS) -c -o $@ $<
%.d: %.c
- @echo " DEP $<"; \
$(CC) $(DEPFLAGS) $< > $@.tmp; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.tmp > $@; \
rm -f $@.tmp
diff -up libnl-1.0-pre8/lib/Makefile.more-build-output libnl-1.0-pre8/lib/Makefile
--- libnl-1.0-pre8/lib/Makefile.more-build-output 2007-12-03 14:24:22.000000000 -0500
+++ libnl-1.0-pre8/lib/Makefile 2007-12-03 14:24:22.000000000 -0500
@@ -42,29 +42,22 @@ export
all:
- @echo " MAKE $(OUT_SLIB)"; \
$(MAKE) $(OUT_SLIB); \
$(MAKE) $(OUT_AR)
$(OUT_SLIB): ../Makefile.opts $(OBJ)
- @echo " LD $(OUT_SLIB)"; \
$(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \
rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \
rm -f $(LN_SLIB) ; $(LN) -s $(LN1_SLIB) $(LN_SLIB)
$(OUT_AR): ../Makefile.opts $(OBJ)
- @echo " AR $(OUT_AR)"; \
$(AR) crus $(OUT_AR) $(OBJ)
clean:
- @echo " CLEAN lib"; \
$(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \
$(RM) -f $(DEPS) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB)
distclean:
- @echo " DISTCLEAN lib"; \
$(RM) -f $(DEPS)
install:
libnl-1.0-pre8-use-vasprintf-retval.patch:
--- NEW FILE libnl-1.0-pre8-use-vasprintf-retval.patch ---
diff -up libnl-1.0-pre8/include/netlink-local.h.use-vasprintf-retval libnl-1.0-pre8/include/netlink-local.h
--- libnl-1.0-pre8/include/netlink-local.h.use-vasprintf-retval 2007-12-03 14:13:52.000000000 -0500
+++ libnl-1.0-pre8/include/netlink-local.h 2007-12-03 14:15:26.000000000 -0500
@@ -273,13 +273,18 @@ static inline void __dp_dump(struct nl_d
vfprintf(parms->dp_fd, fmt, args);
else if (parms->dp_buf || parms->dp_cb) {
char *buf = NULL;
- vasprintf(&buf, fmt, args);
- if (parms->dp_cb)
- parms->dp_cb(parms, buf);
- else
- strncat(parms->dp_buf, buf,
- parms->dp_buflen - strlen(parms->dp_buf) - 1);
- free(buf);
+ int ret;
+ ret = vasprintf(&buf, fmt, args);
+ if (ret >= 0) {
+ if (parms->dp_cb)
+ parms->dp_cb(parms, buf);
+ else
+ strncat(parms->dp_buf, buf,
+ parms->dp_buflen - strlen(parms->dp_buf) - 1);
+ free(buf);
+ } else {
+ // FIXME: indicate error somehow
+ }
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnl/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 2 Nov 2005 21:48:46 -0000 1.5
+++ .cvsignore 12 Feb 2008 04:24:19 -0000 1.6
@@ -2,3 +2,6 @@
libnl-1.pc
libnl-1.0-pre4.tar.gz
libnl-1.0-pre5.tar.gz
+libnl.git20071217.tar.bz2
+libnl-1.0-pre8.git20071218.tar.bz2
+libnl-1.1.tar.gz
libnl-1.0-pre5-debuginfo.patch:
Index: libnl-1.0-pre5-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/libnl/F-7/libnl-1.0-pre5-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnl-1.0-pre5-debuginfo.patch 15 Jun 2006 22:13:54 -0000 1.1
+++ libnl-1.0-pre5-debuginfo.patch 12 Feb 2008 04:24:19 -0000 1.2
@@ -3,9 +3,11 @@
@@ -64,7 +64,7 @@
install:
- mkdir -p $(DESTDIR)$(LIBDIR)/
-- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
-+ install -m 0755 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
- install -m 0644 $(OUT_AR) $(DESTDIR)$(LIBDIR)
- rm -f $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) ; \
- $(LN) -s $(OUT_SLIB) $(DESTDIR)$(LIBDIR)/$(LN1_SLIB)
+ mkdir -p $(DESTDIR)$(libdir)/
+- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir)
++ install -m 0755 $(OUT_SLIB) $(DESTDIR)$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB)
+ $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
+ rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)
+ $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB)
+
libnl-1.0-pre5-static.patch:
Index: libnl-1.0-pre5-static.patch
===================================================================
RCS file: /cvs/extras/rpms/libnl/F-7/libnl-1.0-pre5-static.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnl-1.0-pre5-static.patch 26 May 2006 22:34:56 -0000 1.1
+++ libnl-1.0-pre5-static.patch 12 Feb 2008 04:24:19 -0000 1.2
@@ -1,6 +1,7 @@
---- libnl-1.0-pre5/lib/Makefile.static 2006-05-26 01:37:40.000000000 -0400
-+++ libnl-1.0-pre5/lib/Makefile 2006-05-26 01:38:31.000000000 -0400
-@@ -28,6 +28,7 @@
+diff -up libnl-1.0-pre8/lib/Makefile.orig libnl-1.0-pre8/lib/Makefile
+--- libnl-1.0-pre8/lib/Makefile.orig 2007-11-21 12:25:39.000000000 -0500
++++ libnl-1.0-pre8/lib/Makefile 2007-12-03 14:08:43.000000000 -0500
+@@ -32,6 +32,7 @@ DEPS := $(CIN:%.c=%.d)
OBJ := $(CIN:%.c=%.o)
CFLAGS += -fPIC
OUT_SLIB := $(PACKAGE_NAME).so.$(PACKAGE_VERSION)
@@ -8,7 +9,7 @@
LN_SLIB := $(PACKAGE_NAME).so
LN1_SLIB := $(LN_SLIB).1
-@@ -38,7 +39,8 @@
+@@ -42,7 +43,8 @@ export
all:
@echo " MAKE $(OUT_SLIB)"; \
@@ -18,7 +19,7 @@
$(OUT_SLIB): ../Makefile.opts $(OBJ)
@echo " LD $(OUT_SLIB)"; \
-@@ -48,6 +50,10 @@
+@@ -52,6 +54,10 @@ $(OUT_SLIB): ../Makefile.opts $(OBJ)
@echo " LN $(LN1_SLIB) $(LN_SLIB)"; \
rm -f $(LN_SLIB) ; $(LN) -s $(LN1_SLIB) $(LN_SLIB)
@@ -29,11 +30,11 @@
clean:
@echo " CLEAN lib"; \
$(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \
-@@ -59,6 +65,7 @@
- install:
- mkdir -p $(DESTDIR)$(LIBDIR)/
- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
-+ install -m 0644 $(OUT_AR) $(DESTDIR)$(LIBDIR)
- rm -f $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) ; \
- $(LN) -s $(OUT_SLIB) $(DESTDIR)$(LIBDIR)/$(LN1_SLIB)
- rm -f $(DESTDIR)$(LIBDIR)/$(LN_SLIB) ; \
+@@ -68,6 +74,7 @@ install:
+ $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
+ rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)
+ $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB)
++ install -m 0644 $(OUT_AR) $(DESTDIR)$(libdir)
+
+ $(DEPS): ../Makefile.opts
+
Index: libnl.spec
===================================================================
RCS file: /cvs/extras/rpms/libnl/F-7/libnl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libnl.spec 14 Aug 2006 20:35:18 -0000 1.18
+++ libnl.spec 12 Feb 2008 04:24:19 -0000 1.19
@@ -1,21 +1,17 @@
-%define preversion pre5
-
Summary: Convenience library for kernel netlink sockets
Group: Development/Libraries
License: LGPL
Name: libnl
-Version: 1.0
-Release: 0.10.%{preversion}.4
+Version: 1.1
+Release: 1%{?dist}
URL: http://people.suug.ch/~tgr/libnl/
-Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz
+Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: doxygen
-Patch1: libnl-64bit.patch
-Patch2: libnl-1.0-install-no-root.patch
-Patch3: libnl-1.0-pre5-static.patch
-Patch4: libnl-1.0-pre5-__u64_x86_64.patch
-Patch5: libnl-1.0-pre5-debuginfo.patch
-Patch6: libnl-1.0-pre5-nl_recv.patch
+Patch1: libnl-1.0-pre5-static.patch
+Patch2: libnl-1.0-pre5-debuginfo.patch
+Patch3: libnl-1.0-pre8-use-vasprintf-retval.patch
+Patch4: libnl-1.0-pre8-more-build-output.patch
%description
This package contains a convenience library to simplify
@@ -26,19 +22,18 @@
Summary: Libraries and headers for using libnl
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: kernel-headers
%description devel
This package contains various headers for using libnl
%prep
-%setup -q -n libnl-%{version}-%{preversion}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%setup -q -n %{name}-%{version}
+%patch1 -p1 -b .build-static
+%patch2 -p1 -b .debuginfo
+%patch3 -p1 -b .use-vasprintf-retval
+%patch4 -p1 -b .more-build-output
%build
%configure
@@ -48,22 +43,6 @@
%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-cat >libnl-1.pc <<EOF
-prefix=%{_prefix}
-exec_prefix=%{_prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}
-
-Name: libnl
-Description: Convenience library for netlink sockets
-Version: %{version}-%{release}
-Libs: -L%{_libdir} -lnl
-Cflags:
-EOF
-
-%{__install} -m 644 libnl-1.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -84,6 +63,21 @@
%{_libdir}/pkgconfig/%{name}-1.pc
%changelog
+* Mon Feb 11 2008 Dan Williams <dcbw at redhat.com> - 1.1-1
+- Update to version 1.1
+
+* Tue Dec 18 2007 Dan Williams <dcbw at redhat.com> - 1.0-0.15.pre8.git20071218
+- Handle removal of include/linux/ip_mp_alg.h in 2.6.24
+
+* Tue Dec 18 2007 Dan Williams <dcbw at redhat.com> - 1.0-0.14.pre8.git20071217
+- devel package should require kernel-headers
+
+* Mon Dec 17 2007 Dan Williams <dcbw at redhat.com> - 1.0-0.13.pre8.git20071217
+- Add dist tag to revision
+
+* Mon Dec 17 2007 Dan Williams <dcbw at redhat.com> - 1.0-0.12.pre8.git20071217
+- Update to -pre8 + fixes (rh #401761)
+
* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 1.0-0.10.pre5.4
- Fix nl_recv() for ppc64
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnl/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 26 Jul 2006 15:35:25 -0000 1.6
+++ sources 12 Feb 2008 04:24:19 -0000 1.7
@@ -1 +1 @@
-2cece8968bb36b4cc34b907b6e3c2178 libnl-1.0-pre5.tar.gz
+ae970ccd9144e132b68664f98e7ceeb1 libnl-1.1.tar.gz
--- libnl-1.0-install-no-root.patch DELETED ---
--- libnl-1.0-pre5-__u64_x86_64.patch DELETED ---
--- libnl-1.0-pre5-nl_recv.patch DELETED ---
--- libnl-64bit.patch DELETED ---
More information about the fedora-extras-commits
mailing list