diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/kismet/Makefile | 1 | ||||
-rw-r--r-- | package/kismet/files/kismet-client.conffiles | 4 | ||||
-rw-r--r-- | package/kismet/files/kismet-drone.conffiles | 1 | ||||
-rw-r--r-- | package/kismet/files/kismet-server.conffiles | 3 | ||||
-rw-r--r-- | package/libXxf86vm/Makefile | 2 | ||||
-rw-r--r-- | package/libnetfilter_conntrack/Makefile | 2 | ||||
-rw-r--r-- | package/libnetfilter_log/Makefile | 2 | ||||
-rw-r--r-- | package/libnetfilter_queue/Makefile | 2 | ||||
-rw-r--r-- | package/php/Makefile | 2 | ||||
-rw-r--r-- | package/scanlogd/files/scanlogd.postinst | 36 | ||||
-rw-r--r-- | package/tor/files/tor.postinst | 18 | ||||
-rw-r--r-- | package/trafshow/Makefile | 2 | ||||
-rw-r--r-- | package/ulogd/files/ulogd.conffiles | 1 |
13 files changed, 12 insertions, 64 deletions
diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 319d4b2e6..0ece2d1d3 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -7,6 +7,7 @@ PKG_NAME:= kismet PKG_VERSION:= 2010-01-R1 PKG_RELEASE:= 1 PKG_DESCR:= Kismet +PKG_SECTION:= net PKG_BUILDDEP+= libpcap ncurses PKG_DEPENDS:= libpcap libncurses PKG_MD5SUM:= a6d6edcf65d5bb2cb5de6472bcc16f19 diff --git a/package/kismet/files/kismet-client.conffiles b/package/kismet/files/kismet-client.conffiles deleted file mode 100644 index b849ce1ce..000000000 --- a/package/kismet/files/kismet-client.conffiles +++ /dev/null @@ -1,4 +0,0 @@ -/etc/kismet/ap_manuf -/etc/kismet/client_manuf -/etc/kismet/kismet.conf -/etc/kismet/kismet_ui.conf
\ No newline at end of file diff --git a/package/kismet/files/kismet-drone.conffiles b/package/kismet/files/kismet-drone.conffiles deleted file mode 100644 index 744e24473..000000000 --- a/package/kismet/files/kismet-drone.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/kismet/kismet_drone.conf diff --git a/package/kismet/files/kismet-server.conffiles b/package/kismet/files/kismet-server.conffiles deleted file mode 100644 index 0fdf43763..000000000 --- a/package/kismet/files/kismet-server.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/kismet/ap_manuf -/etc/kismet/client_manuf -/etc/kismet/kismet.conf diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile index 4d8d57f12..41816b575 100644 --- a/package/libXxf86vm/Makefile +++ b/package/libXxf86vm/Makefile @@ -14,7 +14,7 @@ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXXF86VM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXXF86VM,libxxf86vm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile index 83fc76459..517d7d7b2 100644 --- a/package/libnetfilter_conntrack/Makefile +++ b/package/libnetfilter_conntrack/Makefile @@ -18,7 +18,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK,libnetfilter-conntrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: $(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib diff --git a/package/libnetfilter_log/Makefile b/package/libnetfilter_log/Makefile index 24bc47cb5..bfb5bb171 100644 --- a/package/libnetfilter_log/Makefile +++ b/package/libnetfilter_log/Makefile @@ -18,7 +18,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBNETFILTER_LOG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNETFILTER_LOG,libnetfilter-log,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: $(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG)/usr/lib diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile index 737b3d5cc..d10464e00 100644 --- a/package/libnetfilter_queue/Makefile +++ b/package/libnetfilter_queue/Makefile @@ -18,7 +18,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBNETFILTER_QUEUE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNETFILTER_QUEUE,libnetfilter-queue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: $(INSTALL_DIR) $(IDIR_LIBNETFILTER_QUEUE)/usr/lib diff --git a/package/php/Makefile b/package/php/Makefile index d0e5c81cc..485affd63 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -195,6 +195,8 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_PHP)/etc ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc/ ${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin + ${INSTALL_DIR} $(IDIR_PHP_CLI)/etc + ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc/ ${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc/ diff --git a/package/scanlogd/files/scanlogd.postinst b/package/scanlogd/files/scanlogd.postinst index 60b036da4..237852192 100644 --- a/package/scanlogd/files/scanlogd.postinst +++ b/package/scanlogd/files/scanlogd.postinst @@ -1,36 +1,6 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh add_rcconf scanlogd scanlogd NO - - -name=scanlogd -id=53 - -# do not change below -# check if we are on real system -if [ -z "${IPKG_INSTROOT}" ]; then - # create copies of passwd and group, if we use squashfs - rootfs=`mount |awk '/root/ { print $5 }'` - if [ "$rootfs" = "squashfs" ]; then - if [ -h /etc/group ]; then - rm /etc/group - cp /rom/etc/group /etc/group - fi - if [ -h /etc/passwd ]; then - rm /etc/passwd - cp /rom/etc/passwd /etc/passwd - fi - fi -fi - -echo "" -if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/group)" ]; then - echo "adding group $name to /etc/group" - echo "${name}:x:${id}:" >> ${IPKG_INSTROOT}/etc/group -fi - -if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/passwd)" ]; then - echo "adding user $name to /etc/passwd" - echo "${name}:x:${id}:${id}:${name}:/tmp/.${name}:/bin/false" >> ${IPKG_INSTROOT}/etc/passwd -fi - +gid=$(get_next_gid) +add_group scanlogd $gid +add_user scanlogd $(get_next_uid) $gid /tmp/ diff --git a/package/tor/files/tor.postinst b/package/tor/files/tor.postinst index 9ca10117b..b3bb981a1 100644 --- a/package/tor/files/tor.postinst +++ b/package/tor/files/tor.postinst @@ -1,24 +1,6 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh add_rcconf tor tor NO - -# do not change below -# check if we are on real system -if [[ -z $IPKG_INSTROOT ]]; then - # create copies of passwd and group, if we use squashfs - rootfs=`mount |awk '/root/ { print $5 }'` - if [ "$rootfs" = "squashfs" ]; then - if [ -h /etc/group ]; then - rm /etc/group - cp /rom/etc/group /etc/group - fi - if [ -h /etc/passwd ]; then - rm /etc/passwd - cp /rom/etc/passwd /etc/passwd - fi - fi -fi - gid=$(get_next_gid) add_group tor $gid add_user tor $(get_next_uid) $gid /tmp/.tor diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile index 6f0411225..af82cb4e1 100644 --- a/package/trafshow/Makefile +++ b/package/trafshow/Makefile @@ -7,8 +7,10 @@ PKG_NAME:= trafshow PKG_VERSION:= 5.2.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 0b2f0bb23b7832138b7d841437b9e182 +PKG_DESCR:= traffic analyzing tool PKG_SECTION:= net PKG_SITES:= http://www.sfr-fresh.com/linux/misc/ + PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/ulogd/files/ulogd.conffiles b/package/ulogd/files/ulogd.conffiles deleted file mode 100644 index 287b91c95..000000000 --- a/package/ulogd/files/ulogd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ulogd.conf |