backport fixes from changeset:2408 to trunk

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2409 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
index 9de9450..81142d9 100644 (file)
--- a/package/ulogd/Config.in
+++ b/package/ulogd/Config.in
@@ -24,4 +24,10 @@ config BR2_PACKAGE_ULOGD_MOD_PGSQL
        depends BR2_PACKAGE_ULOGD
        select BR2_PACKAGE_LIBPQ
 
+config BR2_PACKAGE_ULOGD_MOD_EXTRA
+       prompt   "ulogd-mod-extra................. All other plugins"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_ULOGD
+
 endmenu

diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index 3a6eafc..42d8a86 100644 (file)
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ulogd
 PKG_VERSION:=1.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2.1
 PKG_MD5SUM:=fa3dfcaacf31855626d5b731b04a077f
 
 PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
@@ -29,7 +29,9 @@ define IPKG_plugin_template
 
 $$(IPKG_$(1)):
        install -m0755 -d $$(IDIR_$(1))/usr/lib/ulogd
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$(2).so $$(IDIR_$(1))/usr/lib/ulogd/
+       for m in $(2); do \
+               cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$${m}.so $$(IDIR_$(1))/usr/lib/ulogd/ ; \
+       done
        $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 
@@ -40,41 +42,43 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,ULOGD,ulogd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call IPKG_plugin_template,ULOGD_MOD_MYSQL,MYSQL))
 $(eval $(call IPKG_plugin_template,ULOGD_MOD_PGSQL,PGSQL))
+$(eval $(call IPKG_plugin_template,ULOGD_MOD_EXTRA,LOCAL LOGEMU OPRINT PWSNIFF SYSLOG))
 
 $(PKG_BUILD_DIR)/.configured:
-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                ac_cv_header_pcap_h=no \
                ./configure \
-                 --target=$(GNU_TARGET_NAME) \
-                 --host=$(GNU_TARGET_NAME) \
-                 --build=$(GNU_HOST_NAME) \
-                 --program-prefix="" \
-                 --program-suffix="" \
-                 --prefix=/usr \
-                 --exec-prefix=/usr \
-                 --bindir=/usr/bin \
-                 --datadir=/usr/share \
-                 --includedir=/usr/include \
-                 --infodir=/usr/share/info \
-                 --libdir=/usr/lib \
-                 --libexecdir=/usr/lib \
-                 --localstatedir=/var \
-                 --mandir=/usr/share/man \
-                 --sbindir=/usr/sbin \
-                 --sysconfdir=/etc \
-                 $(DISABLE_LARGEFILE) \
-                 $(DISABLE_NLS) \
-                 --enable-shared \
-                 --disable-static \
-                 $(ULOGD_MYSQL_OPTION) \
-                 $(ULOGD_PGSQL_OPTION) \
+                       --target=$(GNU_TARGET_NAME) \
+                       --host=$(GNU_TARGET_NAME) \
+                       --build=$(GNU_HOST_NAME) \
+                       --program-prefix="" \
+                       --program-suffix="" \
+                       --prefix=/usr \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \
+                       --enable-shared \
+                       --disable-static \
+                       $(ULOGD_MYSQL_OPTION) \
+                       $(ULOGD_PGSQL_OPTION) \
        );
        touch $@
 
@@ -93,6 +97,9 @@ $(IPKG_ULOGD):
        install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd
        install -d -m0755 $(IDIR_ULOGD)/etc/init.d
        install -m0755 ./files/ulogd.init $(IDIR_ULOGD)/etc/init.d/ulogd
+       ln -sf ulogd $(IDIR_ULOGD)/etc/init.d/S49ulogd
+       install -d -m0755 $(IDIR_ULOGD)/usr/lib/ulogd
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(IDIR_ULOGD)/usr/lib/ulogd/
        install -d -m0755 $(IDIR_ULOGD)/usr/sbin
        cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/
        $(RSTRIP) $(IDIR_ULOGD)

diff --git a/package/ulogd/ipkg/ulogd-mod-extra.control b/package/ulogd/ipkg/ulogd-mod-extra.control
new file mode 100644 (file)
index 0000000..95332ba
--- /dev/null
+++ b/package/ulogd/ipkg/ulogd-mod-extra.control
@@ -0,0 +1,5 @@
+Package: ulogd-mod-extra
+Priority: optional
+Section: net
+Description: Netfilter userspace logging daemon (extra plugins)
+Depends: ulogd