[csw-devel] SF.net SVN: gar:[20041] csw/mgar/pkg/libnids/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Mon Jan 7 01:19:23 CET 2013 

Revision: 20041
          http://gar.svn.sourceforge.net/gar/?rev=20041&view=rev
Author:   wahwah
Date:     2013-01-07 00:19:23 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
libnids/trunk: Version bump, package split, no more old libnet

Modified Paths:
--------------
    csw/mgar/pkg/libnids/trunk/Makefile
    csw/mgar/pkg/libnids/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch
    csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch
    csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch

Property Changed:
----------------
    csw/mgar/pkg/libnids/trunk/Makefile

Modified: csw/mgar/pkg/libnids/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libnids/trunk/Makefile	2013-01-06 16:14:37 UTC (rev 20040)
+++ csw/mgar/pkg/libnids/trunk/Makefile	2013-01-07 00:19:23 UTC (rev 20041)
@@ -1,13 +1,15 @@
+# $Id$
+
 NAME = libnids
-VERSION = 1.23
+VERSION = 1.24
 GARTYPE = v2
 
-DESCRIPTION = implementation of an e-component of network intrusion detection
+DESCRIPTION = E-component of network intrusion detection
 define BLURB
- Libnids is a library that provides a functionality of one of NIDS 
- (Network Intrusion Detection System) components, namely E-component. It means 
- that libnids code watches all local network traffic, cooks received datagrams 
- a bit (quite a bit ;)), and provides convenient information on them to 
+ Libnids is a library that provides a functionality of one of NIDS
+ (Network Intrusion Detection System) components, namely E-component. It means
+ that libnids code watches all local network traffic, cooks received datagrams
+ a bit (quite a bit ;)), and provides convenient information on them to
  analyzing modules of NIDS.
 endef
 
@@ -17,22 +19,41 @@
 
 SPKG_SOURCEURL = http://libnids.sourceforge.net/
 
-RUNTIME_DEP_PKGS += CSWggettextrt CSWglib2 CSWlibnet CSWlibpcap
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=92215
 UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
 
-PATCHFILES  = Makfile.in.diff
+# PATCHFILES  = Makfile.in.diff
 PATCHFILES += checksum.c.diff
 PATCHFILES += configure.diff
-PATCHFILES += ip_options.c.diff
-PATCHFILES += utils.c.diff
+# PATCHFILES += ip_options.c.diff
+# PATCHFILES += utils.c.diff
+PATCHFILES += 0004-Solaris-linking-in-Makefile.in.patch
+PATCHFILES += 0004-Install-into-DESTDIR.patch
+PATCHFILES += 0005-Use-LDFLAGS-when-linking.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
 
-TEST_TARGET = 
+BUILD64 = 1
 
+# http://wiki.opencsw.org/project-libnet
+EXTRA_LINKER_FLAGS = -L$(libdir)/libnet-new
+
+PACKAGES += CSWlibnids1-24
+PKGFILES_CSWlibnids1-24 += $(call baseisadirs,$(libdir),libnids\.so\.1\.24(\.\d+)*)
+SPKG_DESC_CSWlibnids1-24 += $(DESCRIPTION), libnids.so.1.24
+RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibnet1
+RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibpcap1
+RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibglib2-0-0
+
+PACKAGES += CSWlibnids-dev
+SPKG_DESC_CSWlibnids-dev += $(DESCRIPTION), development files
+RUNTIME_DEP_PKGS_CSWlibnids-dev += CSWlibnids1-24
+
+OBSOLETED_BY_CSWlibnids1-24 = CSWlibnids
+
+TEST_TARGET =
+
 include gar/category.mk


Property changes on: csw/mgar/pkg/libnids/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/libnids/trunk/checksums
===================================================================
--- csw/mgar/pkg/libnids/trunk/checksums	2013-01-06 16:14:37 UTC (rev 20040)
+++ csw/mgar/pkg/libnids/trunk/checksums	2013-01-07 00:19:23 UTC (rev 20041)
@@ -1,6 +1 @@
-af35e8ef403a0ca95df2da94db856428  download/libnids-1.23.tar.gz
-5c4890d30fb6d8666f8aa8987d6b4b24  download/Makfile.in.diff
-1eb0e1c82b9855f7526d63323741aec6  download/checksum.c.diff
-875c511f86f39a0b13131f4d3246a35a  download/configure.diff
-d98069814fe6b17ea8c07aecc76e4386  download/ip_options.c.diff
-276ccbd2caeab913432fe749d6a0c020  download/utils.c.diff
+72d37c79c85615ffe158aa524d649610  libnids-1.24.tar.gz

Added: csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch
===================================================================
--- csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch	                        (rev 0)
+++ csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch	2013-01-07 00:19:23 UTC (rev 20041)
@@ -0,0 +1,40 @@
+From 80ddd0039f6240bcc557d186be146872bf5269d9 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 6 Jan 2013 23:51:34 +0100
+Subject: [PATCH] Install into DESTDIR
+
+---
+ src/Makefile.in | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 236e9ba..33af85f 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -68,15 +68,15 @@ $(LIBSHARED): $(OBJS_SHARED)
+ 	$(LD) -G -h               $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
+ 
+ _install install: $(LIBSTATIC)
+-	../mkinstalldirs $(install_prefix)$(libdir)
+-	../mkinstalldirs $(install_prefix)$(includedir)
+-	../mkinstalldirs $(install_prefix)$(mandir)/man3
+-	$(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir)
+-	$(INSTALL) -c -m 644 nids.h $(install_prefix)$(includedir)
+-	$(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3
++	../mkinstalldirs $(DESTDIR)$(install_prefix)$(libdir)
++	../mkinstalldirs $(DESTDIR)$(install_prefix)$(includedir)
++	../mkinstalldirs $(DESTDIR)$(install_prefix)$(mandir)/man3
++	$(INSTALL) -c -m 644 libnids.a $(DESTDIR)$(install_prefix)$(libdir)
++	$(INSTALL) -c -m 644 nids.h $(DESTDIR)$(install_prefix)$(includedir)
++	$(INSTALL) -c -m 644 libnids.3 $(DESTDIR)$(install_prefix)$(mandir)/man3
+ _installshared installshared: install $(LIBSHARED)
+-	$(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir)
+-	ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so
++	$(INSTALL) -c -m 755 $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir)
++	ln -s -f $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir)/libnids.so
+  
+ clean:
+ 	rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED)
+-- 
+1.8.0
+

Added: csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch
===================================================================
--- csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch	                        (rev 0)
+++ csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch	2013-01-07 00:19:23 UTC (rev 20041)
@@ -0,0 +1,25 @@
+From 3e244c710342d7c2309b6b9205e8273afa6f43fc Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 6 Jan 2013 23:47:57 +0100
+Subject: [PATCH] Solaris linking in Makefile.in
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 2204c79..236e9ba 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -65,7 +65,7 @@ $(LIBSTATIC): $(OBJS)
+ 	ar -cr $@ $(OBJS)
+ 	$(RANLIB) $@
+ $(LIBSHARED): $(OBJS_SHARED)
+-	$(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
++	$(LD) -G -h               $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
+ 
+ _install install: $(LIBSTATIC)
+ 	../mkinstalldirs $(install_prefix)$(libdir)
+-- 
+1.8.0
+

Added: csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch
===================================================================
--- csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch	                        (rev 0)
+++ csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch	2013-01-07 00:19:23 UTC (rev 20041)
@@ -0,0 +1,25 @@
+From 0dd8dda4007bc36260c2e294ba58fc4c576984e2 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 7 Jan 2013 01:10:54 +0100
+Subject: [PATCH] Use LDFLAGS when linking
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 33af85f..d95a5c2 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -65,7 +65,7 @@ $(LIBSTATIC): $(OBJS)
+ 	ar -cr $@ $(OBJS)
+ 	$(RANLIB) $@
+ $(LIBSHARED): $(OBJS_SHARED)
+-	$(LD) -G -h               $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
++	$(LD) -G -h    $(LIBSHARED) -L/opt/csw/lib/libnet-new -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
+ 
+ _install install: $(LIBSTATIC)
+ 	../mkinstalldirs $(DESTDIR)$(install_prefix)$(libdir)
+-- 
+1.8.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list