qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-27 07:24:35 +02:00
Code

backport fixes from changeset:2408 to trunk

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2409 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2005-11-10 08:08:12 +00:00
parent 3a22d94318
commit 595cd21460
3 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openwrt/package/ulogd/Config.in
View File

@ -24,4 +24,10 @@ config BR2_PACKAGE_ULOGD_MOD_PGSQL
depends BR2_PACKAGE_ULOGD depends BR2_PACKAGE_ULOGD
select BR2_PACKAGE_LIBPQ 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 endmenu

63
openwrt/package/ulogd/Makefile
View File

@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ulogd PKG_NAME:=ulogd
PKG_VERSION:=1.23 PKG_VERSION:=1.23
PKG_RELEASE:=1 PKG_RELEASE:=2.1
PKG_MD5SUM:=fa3dfcaacf31855626d5b731b04a077f PKG_MD5SUM:=fa3dfcaacf31855626d5b731b04a077f
PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \ PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
@ -29,7 +29,9 @@ define IPKG_plugin_template
$$(IPKG_$(1)): $$(IPKG_$(1)):
install -m0755 -d $$(IDIR_$(1))/usr/lib/ulogd 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)) $(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) $(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,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_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_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_MYSQL,MYSQL))
$(eval $(call IPKG_plugin_template,ULOGD_MOD_PGSQL,PGSQL)) $(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: $(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) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
ac_cv_header_pcap_h=no \ ac_cv_header_pcap_h=no \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--program-prefix="" \ --program-prefix="" \
--program-suffix="" \ --program-suffix="" \
--prefix=/usr \ --prefix=/usr \
--exec-prefix=/usr \ --exec-prefix=/usr \
--bindir=/usr/bin \ --bindir=/usr/bin \
--datadir=/usr/share \ --datadir=/usr/share \
--includedir=/usr/include \ --includedir=/usr/include \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--libdir=/usr/lib \ --libdir=/usr/lib \
--libexecdir=/usr/lib \ --libexecdir=/usr/lib \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--sbindir=/usr/sbin \ --sbindir=/usr/sbin \
--sysconfdir=/etc \ --sysconfdir=/etc \
$(DISABLE_LARGEFILE) \ $(DISABLE_LARGEFILE) \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
$(ULOGD_MYSQL_OPTION) \ $(ULOGD_MYSQL_OPTION) \
$(ULOGD_PGSQL_OPTION) \ $(ULOGD_PGSQL_OPTION) \
); );
touch $@ touch $@
@ -93,6 +97,9 @@ $(IPKG_ULOGD):
install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd
install -d -m0755 $(IDIR_ULOGD)/etc/init.d install -d -m0755 $(IDIR_ULOGD)/etc/init.d
install -m0755 ./files/ulogd.init $(IDIR_ULOGD)/etc/init.d/ulogd 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 install -d -m0755 $(IDIR_ULOGD)/usr/sbin
cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/ cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/
$(RSTRIP) $(IDIR_ULOGD) $(RSTRIP) $(IDIR_ULOGD)

5
openwrt/package/ulogd/ipkg/ulogd-mod-extra.control Normal file
View File

@ -0,0 +1,5 @@
Package: ulogd-mod-extra
Priority: optional
Section: net
Description: Netfilter userspace logging daemon (extra plugins)
Depends: ulogd