I have made the following changes intended for : CE:Adaptation:N9xx-common / libnl1
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5135 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5135: Messages from BOSS: State: review at 2012-06-25T08:19:26 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:Mer:fake:Core:i586 / libnl1 -> CE:Adaptation:N9xx-common / libnl1 changes files: -------------- ++++++ new changes file: --- libnl1.changes +++ libnl1.changes @@ -0,0 +1,27 @@ +* Wed May 16 2012 Marko Saukko <[email protected]> - 1.1 +- Renamed to libnl1 as the libnl in mer core is replaced with 3.x versions. + Remaining in some Adaptation repos for backward compatibility reasons. +- Added Provides: libnl <= 1.1 + +* Sat Feb 27 2010 Anas Nashif <[email protected]> - 1.1 +- Updated with latest spectacle +- Include YAML file in source rpm + +* Tue Feb 16 2010 Anas Nashif <[email protected]> - 1.1 +- Updated yaml and sanitized spec + +* Mon Feb 08 2010 Anas Nashif <[email protected]> - 1.1 +- Fixed spectacle file + +* Tue Feb 2 2010 Zhu Yanhai <[email protected]> 1.1 +- Switch to build with spectacle + +* Mon Dec 14 2009 Yi Yang <[email protected]> 1.1 +- Remove "unset LD_AS_NEEDED" + +* Mon Jun 15 2009 Anas Nashif <[email protected]> - 1.1 +- Update spec file using new spec-builder + +* Tue Dec 16 2008 Arjan van de Ven <[email protected]> 1.1 +- Create standardized spec file + new: ---- libnl-1.0-pre5-debuginfo.patch libnl-1.0-pre5-static.patch libnl-1.0-pre8-more-build-output.patch libnl-1.0-pre8-use-vasprintf-retval.patch libnl-1.1-include-limits-h.patch libnl-1.1.tar.gz libnl1.changes libnl1.spec libnl1.yaml spec files: ----------- ++++++ new spec file: --- libnl1.spec +++ libnl1.spec @@ -0,0 +1,97 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.24.1 +# + +Name: libnl1 + +# >> macros +# << macros + +Summary: Convenience library for kernel netlink sockets +Version: 1.1 +Release: 1 +Group: System/Libraries +License: LGPL +URL: http://people.suug.ch/~tgr/libnl/ +Source0: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.gz +Source100: libnl1.yaml +Patch0: libnl-1.0-pre5-static.patch +Patch1: libnl-1.0-pre5-debuginfo.patch +Patch2: libnl-1.0-pre8-use-vasprintf-retval.patch +Patch3: libnl-1.0-pre8-more-build-output.patch +Patch4: libnl-1.1-include-limits-h.patch +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Provides: libnl <= 1.1 + +%description +This package contains a convenience library to simplify +using the Linux kernel's netlink sockets interface for +network manipulation + + +%package devel +Summary: Libraries and headers for using libnl +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains various headers for using libnl + + +%prep +%setup -q -n libnl-%{version} + +# libnl-1.0-pre5-static.patch +%patch0 -p1 +# libnl-1.0-pre5-debuginfo.patch +%patch1 -p1 +# libnl-1.0-pre8-use-vasprintf-retval.patch +%patch2 -p1 +# libnl-1.0-pre8-more-build-output.patch +%patch3 -p1 +# libnl-1.1-include-limits-h.patch +%patch4 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%configure --disable-static +make %{?jobs:-j%jobs} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +# << install post + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +# >> files +%doc COPYING +%{_libdir}/libnl.so.* +# << files + +%files devel +%defattr(-,root,root,-) +# >> files devel +%doc doc/* +%{_includedir}/netlink/ +%{_libdir}/libnl.so +%{_libdir}/pkgconfig/libnl-1.pc +# << files devel other changes: -------------- ++++++ libnl-1.0-pre5-debuginfo.patch (new) --- libnl-1.0-pre5-debuginfo.patch +++ libnl-1.0-pre5-debuginfo.patch @@ -0,0 +1,13 @@ +--- libnl-1.0-pre5/lib/Makefile.debuginfo 2006-06-15 18:11:21.000000000 -0400 ++++ libnl-1.0-pre5/lib/Makefile 2006-06-15 18:11:28.000000000 -0400 +@@ -64,7 +64,7 @@ + + install: + 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 (new) --- libnl-1.0-pre5-static.patch +++ libnl-1.0-pre5-static.patch @@ -0,0 +1,40 @@ +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) ++OUT_AR := $(PACKAGE_NAME).a + LN_SLIB := $(PACKAGE_NAME).so + LN1_SLIB := $(LN_SLIB).1 + +@@ -42,7 +43,8 @@ export + + all: + @echo " MAKE $(OUT_SLIB)"; \ +- $(MAKE) $(OUT_SLIB) ++ $(MAKE) $(OUT_SLIB); \ ++ $(MAKE) $(OUT_AR) + + $(OUT_SLIB): ../Makefile.opts $(OBJ) + @echo " LD $(OUT_SLIB)"; \ +@@ -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) + ++$(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); \ +@@ -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 + ++++++ libnl-1.0-pre8-more-build-output.patch (new) --- libnl-1.0-pre8-more-build-output.patch +++ libnl-1.0-pre8-more-build-output.patch @@ -0,0 +1,71 @@ +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) $< > [email protected]; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < [email protected] > $@; \ + rm -f [email protected] +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) --- libnl-1.0-pre8-use-vasprintf-retval.patch +++ libnl-1.0-pre8-use-vasprintf-retval.patch @@ -0,0 +1,29 @@ +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 ++ } + } + } + ++++++ libnl-1.1-include-limits-h.patch (new) --- libnl-1.1-include-limits-h.patch +++ libnl-1.1-include-limits-h.patch @@ -0,0 +1,11 @@ +diff -up libnl-1.1/include/netlink-local.h.limits libnl-1.1/include/netlink-local.h +--- libnl-1.1/include/netlink-local.h.limits 2008-02-22 11:31:18.000000000 -0500 ++++ libnl-1.1/include/netlink-local.h 2008-02-22 11:32:57.000000000 -0500 +@@ -22,6 +22,7 @@ + #include <time.h> + #include <stdarg.h> + #include <ctype.h> ++#include <limits.h> + #include <sys/types.h> + #include <sys/socket.h> + #include <inttypes.h> ++++++ libnl-1.1.tar.gz (new) ++++++ libnl1.yaml (new) --- libnl1.yaml +++ libnl1.yaml @@ -0,0 +1,27 @@ +Name: libnl1 +Summary: Convenience library for kernel netlink sockets +Version: 1.1 +Release: 1 +Group: System/Libraries +License: LGPL +URL: http://people.suug.ch/~tgr/libnl/ +Sources: + - http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.gz +Patches: + - libnl-1.0-pre5-static.patch + - libnl-1.0-pre5-debuginfo.patch + - libnl-1.0-pre8-use-vasprintf-retval.patch + - libnl-1.0-pre8-more-build-output.patch + - libnl-1.1-include-limits-h.patch +Provides: + - libnl <= 1.1 +Description: | + This package contains a convenience library to simplify + using the Linux kernel's netlink sockets interface for + network manipulation + +SubPackages: + - Name: devel + Summary: Libraries and headers for using libnl + Group: Development/Libraries + Description: This package contains various headers for using libnl
