Merge pull request #1307 from oneru/add-qrencode

libqrencode: This reverts some unwelcome changes and then fixes a typo in Makefile

diff --git a/libs/libnet-1.2.x/Makefile b/libs/libnet-1.2.x/Makefile
new file mode 100644 (file)
index 0000000..6b4a440
--- /dev/null
+++ b/libs/libnet-1.2.x/Makefile
@@ -0,0 +1,70 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnet
+PKG_VERSION:=1.2-rc3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://sourceforge.net/projects/libnet-dev/files/
+PKG_MD5SUM:=f051e6e5bdecddb90f77c701c2ca1804
+PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += $(FPIC)
+
+define Package/libnet-1.2.x
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+libpcap
+ TITLE:=Low-level packet creation library
+endef
+
+
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static
+
+CONFIGURE_VARS += \
+       ac_cv_libnet_endianess=$(ENDIANESS) \
+       ac_libnet_have_pf_packet=yes \
+       LL_INT_TYPE=libnet_link_linux
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR); touch \
+       configure.in \
+       include.m4 \
+       aclocal.m4 \
+       Makefile.in \
+       );
+       $(call Build/Configure/Default)
+endef
+
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/libnet-1.2.x/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet.h $(STAGING_DIR)/usr/lib/libnet-1.2.x/include
+
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/libnet-1.2.x/include/libnet
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet/libnet-*.h $(STAGING_DIR)/usr/lib/libnet-1.2.x/include/libnet
+
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/libnet-1.2.x/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,la,so*} $(STAGING_DIR)/usr/lib/libnet-1.2.x/lib
+endef
+
+define Package/libnet-1.2.x/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnet-1.2.x))

diff --git a/net/clamav/Makefile b/net/clamav/Makefile
index a401e749328829dc2a1614e77c913dedb587e0b6..3f3edab564093bfd29b4179093dbbc359c910d92 100644 (file)
--- a/net/clamav/Makefile
+++ b/net/clamav/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=clamav
-PKG_VERSION:=0.98.6
+PKG_VERSION:=0.98.7
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/clamav/clamav/$(PKG_VERSION)/
-PKG_MD5SUM:=7f4f7e82a09e42c4ebf153d6d452d9d8
+PKG_SOURCE_URL:=http://sourceforge.net/projects/clamav/files/clamav/$(PKG_VERSION)/
+PKG_MD5SUM:=157c601161da1c2d5a0e48ea1b49e067
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

diff --git a/net/netdiscover/Makefile b/net/netdiscover/Makefile
new file mode 100644 (file)
index 0000000..8aa63fd
--- /dev/null
+++ b/net/netdiscover/Makefile
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=netdiscover
+PKG_VERSION:=0.3-pre-beta7
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-LINUXONLY.tar.gz
+PKG_SOURCE_URL:=http://nixgeneration.com/~jaime/netdiscover/releases/
+PKG_MD5SUM:=8780e66d00496e933b4064cfe9ae61da
+PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/netdiscover
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpcap +libnet-1.2.x +libpthread
+  TITLE:=An active/passive address reconnaissance tool
+  URL:=http://nixgeneration.com/~jaime/netdiscover/
+endef
+
+CONFIGURE_VARS+= \
+       CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \
+       LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib"
+
+define Package/netdiscover/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdiscover $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,netdiscover))

diff --git a/net/radicale/Makefile b/net/radicale/Makefile
index 329ab68f09022074058d18aa97b22891f98a9b6a..f604a9fdf541c7a4488fe3f276686ee5893143f2 100644 (file)
--- a/net/radicale/Makefile
+++ b/net/radicale/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radicale
 PKG_VERSION:=0.10
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Christian Schoenebeck <chris5560@web.de>
+PKG_RELEASE:=2
+PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/radicale/files/radicale.config b/net/radicale/files/radicale.config
index ea10bc9f487a3f7c1d372c59deb044472bf25d47..58148f8233f25f235b6d4ca7218bcf7912c862e7 100644 (file)
--- a/net/radicale/files/radicale.config
+++ b/net/radicale/files/radicale.config
@@ -71,7 +71,6 @@ config setting 'auth'
        # Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | remote_user | custom
        # Default: None
        # if setting 'htpasswd' the file /etc/radicale/users is used (hardcoded)
-#      option type 'htpasswd'
 
        # Htpasswd encryption method
        # Value: plain | sha1 | ssha | crypt
@@ -98,7 +97,6 @@ config setting 'rights'
        # Value: None | authenticated | owner_only | owner_write | from_file | custom
        # Default: None
        # if setting 'from_file' the file /etc/radicale/rights is used (hardcoded)
-#      option  type    'from_file'
 
        # Custom rights handler
 #      option custom_handler ''

diff --git a/net/radicale/files/radicale.hotplug b/net/radicale/files/radicale.hotplug
index 634ad2efa578edfbc6008ea7c54f674910708be6..3b91419864f7a5a02fbcffbb9441bf18b9b0335d 100644 (file)
--- a/net/radicale/files/radicale.hotplug
+++ b/net/radicale/files/radicale.hotplug
@@ -3,7 +3,7 @@
 # only (re-)start on ifup
 [ "$ACTION" = "ifup" ] || exit 0
 
-_PID=$(ps | grep '[p]ython.*[r]adicale' 2>/dev/null | awk '{print \$1}')
+_PID=$(ps | grep '[p]ython.*[r]adicale' 2>/dev/null | awk '{print $1}')
 kill -1 $_PID 2>/dev/null
 if [ $? -eq 0 ]; then
        # only restart if already running

diff --git a/net/radicale/files/radicale.init b/net/radicale/files/radicale.init
index bb35a18a0fddb77cf636aca0a7c55206466660e4..991ca5051296c390e14d599d728ee7dd96ba1dbc 100755 (executable)
--- a/net/radicale/files/radicale.init
+++ b/net/radicale/files/radicale.init
@@ -208,7 +208,7 @@ stop() {
        local _PID=$(eval "$PGREP")
        [ -z "$_PID" ] && return 0      # not running
        kill -15 $_PID 2>/dev/null
-       sleep 1                 # give time to shutdown
+       sleep 3                 # give time to shutdown
        local _tmp=$(eval "$PGREP")
        if [ -z "$_tmp" ]; then
                logger -p user.notice -t "radicale[$_PID]" "Service shutdown successfully"