Merge pull request #4436 from hauke/attr 4445/head
authorHannu Nyman <hannu.nyman@iki.fi>
Tue, 6 Jun 2017 06:56:35 +0000 (09:56 +0300)
committerGitHub <noreply@github.com>
Tue, 6 Jun 2017 06:56:35 +0000 (09:56 +0300)
attr: add PKG_MIRROR_HASH

44 files changed:
lang/lpeg/Makefile
lang/python/python-lxml/Makefile [new file with mode: 0644]
libs/alsa-lib/Makefile
libs/libdmapsharing/Makefile
libs/libdmapsharing/patches/003-make_unit_test_optional.patch [deleted file]
libs/libplist/Makefile
mail/clamsmtp/Makefile [new file with mode: 0644]
mail/clamsmtp/files/clamsmtpd.init [new file with mode: 0644]
multimedia/ices/Makefile
net/freeradius3/Makefile
net/ipsec-tools/Makefile
net/ipsec-tools/files/functions.sh
net/ipsec-tools/files/racoon
net/ipsec-tools/files/racoon.init
net/netatalk/Makefile
net/openssh/Makefile
net/openssh/patches/900-remove-dsa-key-file-patch.patch [deleted file]
net/shorewall-core/Makefile [new file with mode: 0644]
net/shorewall-core/patches/110-lib.common.patch [new file with mode: 0644]
net/shorewall-lite/Makefile [new file with mode: 0644]
net/shorewall-lite/files/hostname [new file with mode: 0644]
net/shorewall-lite/files/hotplug_iface [new file with mode: 0644]
net/shorewall-lite/files/vardir [new file with mode: 0644]
net/shorewall-lite/patches/010-install_cp.patch [new file with mode: 0644]
net/shorewall-lite/patches/120-LOGFILE.patch [new file with mode: 0644]
net/shorewall6-lite/Makefile [new file with mode: 0644]
net/shorewall6-lite/files/hostname [new file with mode: 0644]
net/shorewall6-lite/files/hotplug_iface [new file with mode: 0644]
net/shorewall6-lite/files/vardir [new file with mode: 0644]
net/shorewall6-lite/patches/010-install_cp.patch [new file with mode: 0644]
net/shorewall6-lite/patches/120-LOGFILE.patch [new file with mode: 0644]
net/smartsnmpd/Makefile
net/tgt/Makefile
sound/mpd/Makefile
utils/btrfs-progs/Makefile
utils/ccid/Makefile
utils/cryptsetup/Makefile
utils/klish/Makefile
utils/lvm2/Makefile
utils/nano/Makefile
utils/pciutils/Makefile
utils/pcsc-lite/Makefile
utils/smartmontools/Makefile
utils/squashfs-tools/Makefile

index ee8a4ef1fedd0ff77962ff3a802305b57a2d276c..35f5aa673bb31f3c024875efe5288ac36046b42a 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lpeg
 PKG_VERSION:=0.12.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
 PKG_LICENSE:=MIT
 
@@ -38,7 +38,8 @@ define Build/Configure
 endef
 
 # add make variable overrides here
-MAKE_FLAGS +=
+MAKE_FLAGS += \
+       COPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -O2"
 
 define Package/lpeg/install
        $(INSTALL_DIR) $(1)/usr/lib/lua
diff --git a/lang/python/python-lxml/Makefile b/lang/python/python-lxml/Makefile
new file mode 100644 (file)
index 0000000..2710fef
--- /dev/null
@@ -0,0 +1,94 @@
+#
+# Copyright (C) 2017 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:=python-lxml
+PKG_VERSION:=3.7.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=lxml-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://lxml.de/files/
+PKG_HASH:=59d9176360dbc3919e9d4bfca85c1ca64ab4f4ee00e6f119d7150ba887e3410a
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-lxml-$(PKG_VERSION)
+PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+PKG_LICENSE:=BSD
+PKG_LICENSE_FILES:=LICENSES.txt
+PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+$(call include_mk, python3-package.mk)
+
+define Package/python-lxml/Default
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  URL:=http://lxml.de
+  DEPENDS:=+libxml2 +libxslt +libexslt
+endef
+
+define Package/python-lxml
+$(call Package/python-lxml/Default)
+  TITLE:=python-lxml
+  DEPENDS+=+python-light +python-codecs
+  VARIANT:=python
+endef
+
+define Package/python3-lxml
+$(call Package/python-lxml/Default)
+  TITLE:=python3-lxml
+  DEPENDS+=+python3-light
+  VARIANT:=python3
+endef
+
+define Package/python-lxml/description
+The lxml XML toolkit is a Pythonic binding
+for the C libraries libxml2 and libxslt.
+endef
+
+define Package/python3-lxml/description
+$(call Package/python-lxml/description)
+.
+(Variant for Python3)
+endef
+
+TARGET_LDFLAGS += -lxml2 -lxslt -lexslt
+
+define PyBuild/Compile/Default
+       $(call Build/Compile/PyMod,, \
+               install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \
+               --static \
+               --single-version-externally-managed \
+               , \
+               INCLUDE="$(STAGING_DIR)/usr/include/ $(STAGING_DIR)/usr/include/libxml2" \
+               LIBRARY="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib" \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+       )
+endef
+
+define Py3Build/Compile/Default
+       $(call Build/Compile/Py3Mod,, \
+               install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \
+               --static \
+               --single-version-externally-managed \
+               , \
+               INCLUDE="$(STAGING_DIR)/usr/include/ $(STAGING_DIR)/usr/include/libxml2" \
+               LIBRARY="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib" \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+       )
+endef
+
+$(eval $(call PyPackage,python-lxml))
+$(eval $(call BuildPackage,python-lxml))
+
+$(eval $(call Py3Package,python3-lxml))
+$(eval $(call BuildPackage,python3-lxml))
index b9274ae6ffeb4aa78e2b0626c1ba84fd35c563c6..caf513389fa7d279fe9d76fc37d647c3679f5c97 100644 (file)
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-lib
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
                http://distfiles.gentoo.org/distfiles/
 
-PKG_HASH:=82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515
+PKG_HASH:=91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
                Peter Wagner <tripolar@gmx.at>
 
index 69a375079b9421d78a52fd994ae0d401a6c1f210..986a15d60a7cf39d5a5c36f07065b155924e5e19 100644 (file)
@@ -10,7 +10,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdmapsharing
-PKG_VERSION:=2.9.35
+PKG_VERSION:=2.9.38
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -20,7 +20,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.flyn.org/projects/libdmapsharing/
-PKG_MD5SUM:=02008e1998646d0bb6ca45784133b748
+PKG_MD5SUM:=2494161340c4c3c36907359eeddc4da3
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -44,8 +44,9 @@ define Package/libdmapsharing/decription
 endef
 
 CONFIGURE_ARGS += \
-       --disable-introspection \
-       --disable-gtk-doc
+       --disable-check \
+       --disable-gtk-doc \
+       --disable-introspection
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/
diff --git a/libs/libdmapsharing/patches/003-make_unit_test_optional.patch b/libs/libdmapsharing/patches/003-make_unit_test_optional.patch
deleted file mode 100644 (file)
index 14d020f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,7 +357,13 @@ if test -n "$BUILD_DPAPVIEW" ; then
-       AC_WARN([will not build dpapview])
- fi
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
-+dnl Test if --enable-unit-test given
-+AC_ARG_ENABLE(unit-test, [AC_HELP_STRING([--enable-unit-test],[enable unit test])])
-+if test "x$enable_unit_test" = "xyes" ; then
-+  PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
-+else
-+  have_check=no
-+fi
- AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
- if test "x$have_check" = "xyes"; then
-       AC_DEFINE(HAVE_CHECK, 1, [Define if check support is enabled])
index bb61336c4c1b97e5a44b6d875aff677b5d16aa09..2a787f29627fb0fd9dc980ff4af570b4acbaf5e4 100644 (file)
@@ -76,6 +76,8 @@ endef
 CONFIGURE_ARGS += \
        --without-cython
 
+TARGET_LDFLAGS += -lz
+
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/plist $(1)/usr/include/
diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
new file mode 100644 (file)
index 0000000..449594b
--- /dev/null
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2017 Lucian Cristian <lucian.cristian@gmail.com>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=clamsmtp
+PKG_VERSION:=1.10
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://thewalter.net/stef/software/clamsmtp/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=a52fdb4b26e11ece30c478a806c95b1eda16f4e73937bd560ece7017fb0df92a
+
+MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
+PKG_LICENSE:=GPLv2
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/clamsmtp
+  SECTION:=mail
+  CATEGORY:=Mail
+  DEPENDS:=+libpthread
+  TITLE:=clamsmtp
+  URL:=http://thewalter.net/stef/software/clamsmtp/
+endef
+
+define Package/clamsmtp/description
+       ClamSMTP is an SMTP filter that allows you to check for viruses using the ClamAV anti-virus software.
+endef
+
+define Package/clamsmtp/install
+       $(INSTALL_DIR)  $(1)/usr/sbin \
+                       $(1)/etc/init.d
+       $(CP) $(PKG_BUILD_DIR)/src/clamsmtpd $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/doc/clamsmtpd.conf $(1)/etc/
+       $(INSTALL_BIN) ./files/clamsmtpd.init $(1)/etc/init.d/clamsmtpd
+endef
+
+$(eval $(call BuildPackage,clamsmtp))
diff --git a/mail/clamsmtp/files/clamsmtpd.init b/mail/clamsmtp/files/clamsmtpd.init
new file mode 100644 (file)
index 0000000..9b7cf87
--- /dev/null
@@ -0,0 +1,16 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2017 Lucian Cristian
+
+START=91
+USE_PROCD=1
+
+PROG=/usr/sbin/clamsmtpd
+
+start_service(){
+        procd_open_instance
+        procd_set_param command $PROG -p /var/run/clamsmtpd.pid
+        procd_close_instance
+}
+service_triggers(){
+        procd_add_reload_trigger "clamsmtpd"
+}
index c0569ab4fddd7c99f1ca9a94f729b297db6cb144..e549f501cfdc5a837e2fc2eee1caf3fc87f74950 100644 (file)
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+= \
        --with-ogg="$(STAGING_DIR)/usr/include" \
        --with-vorbis="$(STAGING_DIR)/usr/include"
 
-TARGET_LDFLAGS+= -logg
+TARGET_LDFLAGS+= -logg -lvorbisidec
 
 define Package/ices/install
        $(INSTALL_DIR) $(1)/usr/bin
index a71c214864606a53e876889ca010d29de8a1a543..cf55b29943e2a302d8f298d44eedab5766124af6 100644 (file)
@@ -274,7 +274,15 @@ define Package/freeradius3-mod-passwd/conffiles
 /etc/freeradius3/mods-enabled/passwd
 endef
 
-# LDAP support has not been ported
+define Package/freeradius3-mod-ldap
+  $(call Package/freeradius3/Default)
+  DEPENDS:=freeradius3 +libopenldap @FREERADIUS3_OPENSSL
+  TITLE:=LDAP Authentication
+endef
+
+define Package/freeradius3-mod-ldap/conffiles
+/etc/freeradius3/mods-available/ldap
+endef
 
 define Package/freeradius3-mod-logintime
   $(call Package/freeradius3/Default)
@@ -396,7 +404,6 @@ CONFIGURE_ARGS+= \
        --without-rlm_idn \
        --without-rlm_ippool \
        --without-rlm_krb5 \
-       --without-rlm_ldap \
        --without-rlm_opendirectory \
        --without-rlm_pam \
        --without-rlm_perl \
@@ -473,6 +480,14 @@ else
   CONFIGURE_ARGS+= --without-rlm_unix
 endif
 
+ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-ldap),)
+  CONFIGURE_ARGS+= --with-rlm_ldap \
+               --with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
+               --with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
+else
+  CONFIGURE_ARGS+= --without-rlm_ldap
+endif
+
 CONFIGURE_VARS+= \
        LDFLAGS="$$$$LDFLAGS" \
        LIBS="$(CONFIGURE_LIBS)" \
@@ -587,6 +602,7 @@ $(eval $(call BuildPlugin,freeradius3-mod-exec,rlm_exec,))
 $(eval $(call BuildPlugin,freeradius3-mod-expiration,rlm_expiration,))
 $(eval $(call BuildPlugin,freeradius3-mod-expr,rlm_expr,))
 $(eval $(call BuildPlugin,freeradius3-mod-files,rlm_files,))
+$(eval $(call BuildPlugin,freeradius3-mod-ldap,rlm_ldap,))
 $(eval $(call BuildPlugin,freeradius3-mod-logintime,rlm_logintime,))
 $(eval $(call BuildPlugin,freeradius3-mod-mschap,rlm_mschap,))
 $(eval $(call BuildPlugin,freeradius3-mod-pap,rlm_pap,))
index 806c16090a4949713168526b922287543a97f82e..6134a09186900ae5a5ca845fa19ad3231c56c0db 100644 (file)
@@ -11,8 +11,9 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.8.2
-PKG_RELEASE:=5
-PKG_MAINTAINER:=Noah Meyerhans <frodo@morgul.net>
+PKG_RELEASE:=6
+PKG_MAINTAINER:=Noah Meyerhans <frodo@morgul.net>, \
+       Vitaly Protsko <villy@sft.ru>
 PKG_LICENSE := BSD-3-Clause
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
index e3e739b93b98ef795998ed082f8f1c742ed2bae3..45715b5a398a582fd7ba50de3981436f194c3938 100644 (file)
@@ -88,6 +88,41 @@ spd$spdcmd $ritem $litem any -P in ipsec esp/tunnel/$4-$gate/require;
   done
 }
 
+manage_nonesa() {
+  local spdcmd
+  local item
+  local cout cin
+
+  if [ -z "$4" ]; then
+    $log "Bad usage of manage_nonesa"
+    errno=3; return 3
+  fi
+
+  case "$1" in
+    add|up|1) spdcmd=add ;;
+    del|down|0) spdcmd=delete ;;
+    *) errno=3; return 3 ;;
+  esac
+
+  case "$2" in
+    local|remote) ;;
+    *) errno=3; return 3 ;;
+  esac
+
+  for item in $3 ; do
+    if [ "$2" = "local" ]; then
+      cout="$4 $item"
+      cin="$item $4"
+    else
+      cout="$item $4"
+      cin="$4 $item"
+    fi
+    echo "
+spd$spdcmd $cout any -P out none;
+spd$spdcmd $cin any -P in none;
+" | /usr/sbin/setkey -c 1>&2
+  done
+}
 
 . /lib/functions/network.sh
 
index 3ce41eb495863bb9c68f77d3b79860bc0820d8f6..e2c8400b47f33c592ecc629a0ed1fc7b6d518873 100644 (file)
@@ -51,6 +51,10 @@ config sainfo 'office'
        option  p2_proposal     'example_prop2'
        option  local_net       '192.168.8.0/24'
        option  remote_net      '192.168.1.0/24'
+# you can exclude some local or remote
+# addresses from SA rules
+       list    local_exclude   '192.168.8.0/30'
+       list    remote_exclude  '192.168.1.128/29'
 
 config sainfo 'welcome'
        option  p2_proposal     'example_in2'
index 6520d5bdeb9e3772d36a567d00849218a2b18044..247bdfc674c058bbecb4e2d52bf2c6e856ff3623 100644 (file)
@@ -183,10 +183,12 @@ setup_sa() {
     echo -e "  split_network include $locnet;\n}" >> $conf
 
   elif [ -z "$client" ]; then
-    manage_sa add $locnet $remnet $remote
+    config_list_foreach "$1" remote_exclude manage_nonesa add remote "$locnet"
+    config_list_foreach "$1" local_exclude manage_nonesa add local "$remnet"
+    manage_sa add "$locnet" "$remnet" $remote
     test $? -gt 0 -o $errno -gt 0 && return $errno
 
-    manage_fw add $confIntZone $confExtZone $remnet
+    manage_fw add $confIntZone $confExtZone "$remnet"
   fi
 }
 
@@ -339,8 +341,10 @@ destroy_sa() {
     errno=4; return 4
   fi
 
-  manage_sa del $locnet $remnet $2
-  manage_fw del $confIntZone $confExtZone $remnet
+  config_list_foreach "$1" remote_exclude manage_nonesa del remote "$locnet"
+  config_list_foreach "$1" local_exclude manage_nonesa del local "$remnet"
+  manage_sa del "$locnet" "$remnet" $2
+  manage_fw del $confIntZone $confExtZone "$remnet"
 }
 
 destroy_tunnel() {
index ddfedbfee6f63246fc238674681b29960d62c9d8..430b963dadc28fe23defb8299516cb9a52c37f72 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netatalk
-PKG_VERSION:=3.1.10
-PKG_RELEASE:=1
+PKG_VERSION:=3.1.11
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/netatalk
-PKG_MD5SUM:=2b40161985bb32cff5660bf689a4704f15c33bb87565efc7805dd5c75ad1fcc7
+PKG_HASH:=3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -28,7 +28,7 @@ define Package/netatalk
   DEPENDS:=+libattr +libdb47 +libgcrypt +libopenssl $(LIBRPC_DEPENDS)
   TITLE:=netatalk
   URL:=http://netatalk.sourceforge.net
-  MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+  MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 endef
 
 define Package/netatalk/decription
@@ -37,10 +37,6 @@ define Package/netatalk/decription
   Protocol Suite.
 endef
 
-define Package/netatalk/conffiles
-/etc/netatalk/afpd.conf
-endef
-
 TARGET_CFLAGS += -std=gnu99
 TARGET_LDFLAGS += $(LIBRPC)
 
@@ -89,8 +85,8 @@ define Package/netatalk/install
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_dbd $(1)/usr/sbin/
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_metad $(1)/usr/sbin/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/uams/*.so $(1)/usr/lib/uams/
-       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/afp.conf $(1)/etc/
-       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/extmap.conf $(1)/etc/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/afp.conf $(1)/etc/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/extmap.conf $(1)/etc/
        $(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd
 endef
 
index 202c4383e97c807babf3b4d98a201d26687b89ab..e076ab232c4bed5509161c3716f704bd69662ef7 100644 (file)
@@ -248,6 +248,7 @@ define Package/openssh-server/install
        $(INSTALL_DIR) $(1)/etc/ssh
        chmod 0700 $(1)/etc/ssh
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
+       sed -r -i 's,^#(HostKey /etc/ssh/ssh_host_(rsa|ecdsa|ed25519)_key)$$$$,\1,' $(1)/etc/ssh/sshd_config
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
        $(INSTALL_DIR) $(1)/usr/sbin
diff --git a/net/openssh/patches/900-remove-dsa-key-file-patch.patch b/net/openssh/patches/900-remove-dsa-key-file-patch.patch
deleted file mode 100644 (file)
index 602deda..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/servconf.c       2017-03-19 20:39:27.000000000 -0600
-+++ b/servconf.c       2017-06-01 19:12:51.338645002 -0600
-@@ -201,8 +201,10 @@
-               /* fill default hostkeys for protocols */
-               options->host_key_files[options->num_host_key_files++] =
-                   _PATH_HOST_RSA_KEY_FILE;
-+#if 0
-               options->host_key_files[options->num_host_key_files++] =
-                   _PATH_HOST_DSA_KEY_FILE;
-+#endif
- #ifdef OPENSSL_HAS_ECC
-               options->host_key_files[options->num_host_key_files++] =
-                   _PATH_HOST_ECDSA_KEY_FILE;
diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile
new file mode 100644 (file)
index 0000000..3a60d7a
--- /dev/null
@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+# Copyright (C) 2017 Willem van den Akker <wvdakker@wilsoft.nl>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shorewall-core
+PKG_VERSION:=5.1.4.1
+PKG_DIRECTORY:=5.1
+PKG_RELEASE:=1
+PKG_MAINVERSION:=5.1.4
+
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_DIRECTORY)/shorewall-$(PKG_MAINVERSION)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_HASH:=118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e
+
+PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shorewall-core
+    SECTION:=net
+    CATEGORY:=Network
+    DEPENDS:=+ip +iptables
+    TITLE:=Shorewall Core
+    URL:=http://www.shorewall.net/
+    SUBMENU:=Firewall
+endef
+
+define Package/shorewall-core/description
+       The Shoreline Firewall, is high-level tool for configuring Netfilter.
+       This package provides the core Shorewall libraries installed in /usr/share/shorewall/,
+       which are required for the rest of the Shorewall packages to work.
+endef
+
+define Package/shorewall-core/conffiles
+       /usr/share/shorewall/shorewallrc
+endef
+
+CONFIGURE_ARGS += \
+       vendor=openwrt
+
+define Build/Compile
+       DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+endef
+
+define Package/shorewall-core/install
+       $(INSTALL_DIR) $(1)/usr/share
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall/wait4ifup $(1)/usr/share/shorewall
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/shorewall $(1)/usr/sbin
+endef
+
+$(eval $(call BuildPackage,shorewall-core))
diff --git a/net/shorewall-core/patches/110-lib.common.patch b/net/shorewall-core/patches/110-lib.common.patch
new file mode 100644 (file)
index 0000000..6008d27
--- /dev/null
@@ -0,0 +1,22 @@
+Index: shorewall-core-5.0.15.2/lib.common
+===================================================================
+--- shorewall-core-5.0.15.2.orig/lib.common    2016-12-20 23:42:20.000000000 +0100
++++ shorewall-core-5.0.15.2/lib.common 2017-01-02 11:33:03.026495427 +0100
+@@ -352,7 +352,7 @@
+     if [ -z "$MODULESDIR" ]; then
+       uname=$(uname -r)
+-      MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
++      MODULESDIR=/lib/modules/$uname:/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
+       if [ -n "$extras" ]; then
+           for directory in $(split "$extras"); do
+               MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory"
+@@ -408,7 +408,7 @@
+     if [ -z "$MODULESDIR" ]; then
+       uname=$(uname -r)
+-      MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
++      MODULESDIR=/lib/modules/$uname:/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
+       if [ -n "$extras" ]; then
+           for directory in $(split "$extras"); do
+               MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory"
diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
new file mode 100644 (file)
index 0000000..7cc25b2
--- /dev/null
@@ -0,0 +1,76 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+# Copyright (C) 2017 Willem van den Akker <wvdakker@wilsoft.nl>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shorewall-lite
+PKG_VERSION:=5.1.4.1
+PKG_DIRECTORY:=5.1
+PKG_MAINVERSION:=5.1.4
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_DIRECTORY)/shorewall-$(PKG_MAINVERSION)/ 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_HASH:=c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896
+
+PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shorewall-lite
+    SECTION:=net
+    CATEGORY:=Network
+    DEPENDS:=+ip +iptables +shorewall-core
+    TITLE:=Shorewall Lite
+    URL:=http://www.shorewall.net/
+    SUBMENU:=Firewall
+endef
+
+define Package/shorewall-lite/description
+       The Shoreline Firewall, is high-level tool for configuring Netfilter.
+
+       Shorewall allows for central administration of multiple IPv4 firewalls
+       through use of Shorewall lite. The full Shorewall product is installed
+       on a central administrative system where compiled Shorewall scripts are
+       generated. These scripts are copied to the firewall systems where they
+       run under the control of Shorewall-lite.
+
+       Note: This is the IPv4 implementation of Shorewall.
+endef
+
+define Package/shorewall-lite/conffiles
+/etc/shorewall-lite/shorewall-lite.conf
+/etc/shorewall-lite/vardir
+endef
+
+CONFIGURE_ARGS += \
+       vendor=openwrt
+
+define Build/Compile
+       DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+endef
+
+define Package/shorewall-lite/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_DIR) $(1)/etc/shorewall-lite/state
+       $(INSTALL_DIR) $(1)/usr/share
+       $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall-lite
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall-lite $(1)/usr/share
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall-lite $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall-lite/shorecap $(1)/usr/share/shorewall-lite
+       $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall-lite
+       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall-lite $(1)/etc
+       $(CP) $(PKG_INSTALL_DIR)/etc/init.d $(1)/etc
+       $(CP) ./files/vardir $(1)/etc/shorewall-lite
+endef
+
+$(eval $(call BuildPackage,shorewall-lite))
diff --git a/net/shorewall-lite/files/hostname b/net/shorewall-lite/files/hostname
new file mode 100644 (file)
index 0000000..42e1643
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+cat /proc/sys/kernel/hostname
diff --git a/net/shorewall-lite/files/hotplug_iface b/net/shorewall-lite/files/hotplug_iface
new file mode 100644 (file)
index 0000000..b8b7983
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# should restart shorewall-lite when an interface comes up
+
+[ ifup = "$ACTION" ] && {
+        /etc/init.d/shorewall-lite restart
+}
+
+[ ifdown = "$ACTION" ] && {
+        # might need to restore some routing
+        /etc/init.d/shorewall-lite restart
+}
diff --git a/net/shorewall-lite/files/vardir b/net/shorewall-lite/files/vardir
new file mode 100644 (file)
index 0000000..8a5071d
--- /dev/null
@@ -0,0 +1,3 @@
+# move state dir out of ram
+VARDIR=/etc/shorewall-lite/state
+
diff --git a/net/shorewall-lite/patches/010-install_cp.patch b/net/shorewall-lite/patches/010-install_cp.patch
new file mode 100644 (file)
index 0000000..0cc8e6c
--- /dev/null
@@ -0,0 +1,13 @@
+Index: shorewall-lite-5.0.15.2/install.sh
+===================================================================
+--- shorewall-lite-5.0.15.2.orig/install.sh    2016-12-20 18:41:05.000000000 +0100
++++ shorewall-lite-5.0.15.2/install.sh 2017-01-04 12:01:31.018724737 +0100
+@@ -549,7 +549,7 @@
+       chmod 755 ${DESTDIR}${SYSCONFDIR}
+     fi
+-    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT} 0640
++    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT}/${SYSCONFFILE} 0640
+     echo "$SYSCONFFILE file installed in ${DESTDIR}${SYSCONFDIR}/${PRODUCT}"
+ fi
diff --git a/net/shorewall-lite/patches/120-LOGFILE.patch b/net/shorewall-lite/patches/120-LOGFILE.patch
new file mode 100644 (file)
index 0000000..90f0947
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/shorewall-lite.conf 2012-08-08 16:29:23.000000000 +0200
++++ b/shorewall-lite.conf 2012-08-13 11:11:11.687938395 +0200
+@@ -28,7 +28,7 @@
+ #                              L O G G I N G
+ ###############################################################################
+-LOGFILE=
++LOGFILE=/dev/null
+ ###############################################################################
+ #       L O C A T I O N   O F   F I L E S   A N D   D I R E C T O R I E S
\ No newline at end of file
diff --git a/net/shorewall6-lite/Makefile b/net/shorewall6-lite/Makefile
new file mode 100644 (file)
index 0000000..98a9c37
--- /dev/null
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+# Copyright (C) 2017 Willem van den Akker <wvdakker@wilsoft.nl>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shorewall6-lite
+PKG_VERSION:=5.1.4.1
+PKG_DIRECTORY:=5.1
+PKG_MAINVERSION:=5.1.4
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_DIRECTORY)/shorewall-$(PKG_MAINVERSION)/ 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_HASH:=b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b
+
+PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shorewall6-lite
+    SECTION:=net
+    CATEGORY:=Network
+    DEPENDS:=+ip +iptables6 +shorewall-core
+    TITLE:=Shorewall6 Lite
+    URL:=http://www.shorewall.net/
+    SUBMENU:=Firewall
+endef
+
+define Package/shorewall6-lite/description
+       The Shoreline Firewall, is high-level tool for configuring Netfilter.
+
+       Shorewall6 allows for central administration of multiple IPv6 firewalls
+       through use of Shorewall6 lite. The full Shorewall6 product is installed
+       on a central administrative system where compiled Shorewall6 scripts are
+       generated. These scripts are copied to the firewall systems where they
+       run under the control of Shorewall6-lite.
+
+       Note: This is the IPv6 implementation of Shorewall.
+endef
+
+define Package/shorewall6-lite/conffiles
+/etc/shorewall6-lite/shorewall6-lite.conf
+/etc/shorewall6-lite/vardir
+endef
+
+CONFIGURE_ARGS += \
+       vendor=openwrt
+
+define Build/Compile
+       DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+endef
+
+define Package/shorewall6-lite/install
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_DIR) $(1)/etc/shorewall6-lite/state
+       $(INSTALL_DIR) $(1)/usr/share
+       $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6-lite
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6-lite $(1)/usr/share
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall6-lite $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall6-lite/shorecap $(1)/usr/share/shorewall6-lite
+       $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall6-lite
+       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite $(1)/etc
+       $(CP) $(PKG_INSTALL_DIR)/etc/init.d $(1)/etc
+       $(CP) ./files/vardir $(1)/etc/shorewall6-lite
+endef
+
+$(eval $(call BuildPackage,shorewall6-lite))
diff --git a/net/shorewall6-lite/files/hostname b/net/shorewall6-lite/files/hostname
new file mode 100644 (file)
index 0000000..42e1643
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+cat /proc/sys/kernel/hostname
diff --git a/net/shorewall6-lite/files/hotplug_iface b/net/shorewall6-lite/files/hotplug_iface
new file mode 100644 (file)
index 0000000..40b8a0d
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# should restart shorewall6-lite when an interface comes up
+
+[ ifup = "$ACTION" ] && {
+        /etc/init.d/shorewall6-lite restart
+}
+
+[ ifdown = "$ACTION" ] && {
+        # might need to restore some routing
+        /etc/init.d/shorewall6-lite restart
+}
diff --git a/net/shorewall6-lite/files/vardir b/net/shorewall6-lite/files/vardir
new file mode 100644 (file)
index 0000000..e7a9030
--- /dev/null
@@ -0,0 +1,2 @@
+# move state dir out of ram
+VARDIR=/etc/shorewall6-lite/state
diff --git a/net/shorewall6-lite/patches/010-install_cp.patch b/net/shorewall6-lite/patches/010-install_cp.patch
new file mode 100644 (file)
index 0000000..44f63e3
--- /dev/null
@@ -0,0 +1,13 @@
+Index: shorewall6-lite-5.0.15.2/install.sh
+===================================================================
+--- shorewall6-lite-5.0.15.2.orig/install.sh   2016-12-20 18:41:05.000000000 +0100
++++ shorewall6-lite-5.0.15.2/install.sh        2017-01-04 12:01:31.018724737 +0100
+@@ -549,7 +549,7 @@
+       chmod 755 ${DESTDIR}${SYSCONFDIR}
+     fi
+-    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT} 0640
++    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT}/${SYSCONFFILE} 0640
+     echo "$SYSCONFFILE file installed in ${DESTDIR}${SYSCONFDIR}/${PRODUCT}"
+ fi
diff --git a/net/shorewall6-lite/patches/120-LOGFILE.patch b/net/shorewall6-lite/patches/120-LOGFILE.patch
new file mode 100644 (file)
index 0000000..554f7ce
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/shorewall6-lite.conf 2012-08-08 16:29:23.000000000 +0200
++++ b/shorewall6-lite.conf 2012-08-13 11:11:11.687938395 +0200
+@@ -28,7 +28,7 @@
+ #                              L O G G I N G
+ ###############################################################################
+-LOGFILE=
++LOGFILE=/dev/null
+ ###############################################################################
+ #       L O C A T I O N   O F   F I L E S   A N D   D I R E C T O R I E S
\ No newline at end of file
index 9be39cbacf5c0ba01946a1e1df70d08fb5927fd2..0f767daa987e568733a23af64694bb4119b9e6db 100644 (file)
@@ -47,6 +47,7 @@ SCONS_OPTIONS += --transport=uloop
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
                $(SCONS_VARS) \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                scons \
                        prefix=/usr \
                        $(SCONS_OPTIONS) \
index 3a0117345f5bfbeb1ac9ee528cf65ef466b50cd7..82d11030ffe2bc9457faa2340e8a2d6acbdebf18 100644 (file)
@@ -30,7 +30,7 @@ define Package/tgt
   CATEGORY:=Network
   URL:=http://stgt.sourceforge.net/
   TITLE:=userspace iSCSI target
-  DEPENDS:=+libpthread +libaio @KERNEL_AIO @KERNEL_DIRECT_IO
+  DEPENDS:=+libpthread +libaio @KERNEL_AIO
 endef
 
 define Package/tgt/description
@@ -41,9 +41,11 @@ Note that if you are interested in only iSCSI (probably you are), you need only
 endef
 
 define Build/Compile
-       CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) \
+       CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+               $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                LD="$(TARGET_CC)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                install-programs
 endef
 
index 33138d19c2042d7e6b06badea807a88f8822165a..a64cac4b798abccd248bd617b175aa79014deae0 100644 (file)
@@ -24,6 +24,7 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_IPV6 \
 
 PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
index 70c4a06c6d7020adb1cb162ffb5cc646eadabf23..651852ece949f3743e9cbae34e42d879f92053e0 100644 (file)
@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=btrfs-progs
-PKG_VERSION:=4.7.2
+PKG_VERSION:=4.11
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/
-PKG_MD5SUM:=f49bc9e143ffe60260c5bd70ef3b624576673f8b50f41e309892a425f7fbe60f
+PKG_MD5SUM:=25ba238f44b9a1a54e62f7b361bdc9d8
+PKG_HASH:=e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
@@ -45,7 +46,7 @@ define Package/btrfs-progs/description
 endef
 
 progs = btrfs btrfs-debug-tree btrfs-find-root btrfs-image btrfs-map-logical \
-       btrfs-show-super btrfstune btrfs-zero-log fsck.btrfs mkfs.btrfs
+       btrfs-select-super btrfstune btrfs-zero-log fsck.btrfs mkfs.btrfs
 
 CONFIGURE_ARGS += \
        --disable-backtrace \
index 8b3b09d5518beae4de7d1663e2230d21895ccf0c..25b4cf23f58d22d573ca7e77d81383f2a0240d0a 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ccid
-PKG_VERSION:=1.4.26
+PKG_VERSION:=1.4.27
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4205
-PKG_MD5SUM:=3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f
+PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4218
+PKG_HASH:=a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=LGPL-2.1+
 PKG_LICENSE_FILES:=COPYING
index 691103fbd4b56f395c467f0c7e8599b7491ff7c9..ae0c36c9402ab19e585ae43b8839a19c224021ad 100644 (file)
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cryptsetup
-PKG_VERSION:=1.7.2
+PKG_VERSION:=1.7.5
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
 PKG_LICENSE_FILES:=COPYING COPYING.LGPL
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v1.7
-PKG_MD5SUM:=a11a140cea496961222170944db01fc1
+PKG_HASH:=2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
index 4374e276bb25e87079b15eca6d9721360ef77acd..0a63a1053b7f3a6637f29412666ff00bd39eb088 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=klish
 PKG_VERSION:=2.1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://libcode.org/attachments/download/66/
@@ -50,6 +50,9 @@ define Package/klish/description
  More information about these tools is to be found on the klish web site.
 endef
 
+TARGET_LDFLAGS += -lxml2 -lz
+TARGET_CFLAGS += -D_XOPEN_SOURCE=500
+
 define Build/Configure
        $(call Build/Configure/Default, \
                --with-libxml2 \
index 928050a9f010fa2257dc523b56206f4d9c2c8a08..1e477ef22946753a6fba36c1c7461627a3a93dd1 100644 (file)
@@ -9,13 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
-PKG_VERSION:=2.02.165
+PKG_VERSION:=2.02.168
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0 LGPL-2.1
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/releases
-PKG_MD5SUM:=d459cfe50fd549fe41eeed4ef8fbca3f9833f68012f735adb3462483360e07c7
+PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/releases \
+               http://ftp.gwdg.de/pub/linux/sources.redhat.com/lvm2/
+PKG_HASH:=23a3d1cddd41b3ef51812ebf83e9fa491f502fe74130d4263be327a91914660d
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
 
index db285504f8a33caeed9441c8c5fc37f05b7e0a05..9df30678ec1d44609a2779de9ef96d65ca50cc46 100644 (file)
@@ -8,15 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nano
-PKG_VERSION:=2.7.5
+PKG_VERSION:=2.8.4
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/nano
-PKG_MD5SUM:=002703e368e07882f75e304c8860d83d
-PKG_HASH:=a64d24e6bc4fc448376d038f9a755af77f8e748c9051b6f45bf85e783a7e67e4
+PKG_HASH:=c7cf264f0f3e4af43ecdbc4ec72c3b1e831c69a1a5f6512d5b0c109e6bac7b11
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
@@ -40,10 +39,9 @@ endef
 
 CONFIGURE_ARGS += \
        --enable-tiny \
-       --disable-glibtest \
        --disable-utf8 \
-        --without-slang \
-        --disable-color \
+       --without-slang \
+       --disable-color \
 
 CONFIGURE_VARS += \
        ac_cv_header_regex_h=no \
index 3f61b4450fd39f624d3ae33b6527258a76c88f21..c0010cf77b2269172ea3b278638c71ac5d4384ae 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pciutils
 PKG_VERSION:=3.5.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils
@@ -45,9 +45,9 @@ exit 0
 endef
 
 MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+       CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
        PREFIX="/usr" \
-       HOST="$(GNU_TARGET_NAME)" \
+       HOST="Linux" \
        HWDB="no" \
        ZLIB="yes"
 
index e9ebe64524ee5e6cfb6b2abd0be98ed1cb951533..6d246bf79706d813884654056d2a9642769c3325 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcsc-lite
-PKG_VERSION:=1.8.20
+PKG_VERSION:=1.8.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4203
-PKG_MD5SUM:=ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2
+PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4216
+PKG_HASH:=fe3365eb7d4ce0fe891e2b6d6248351c287435ca502103f1f1431b1710e513ad
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
index 88d68402042d4d240a87deae1a0bf1e75849214a..dc420e072bfcc949672b19e958683ade14a41d24 100644 (file)
@@ -55,13 +55,17 @@ define Package/smartd/description
   ATA and SCSI disks. It is derived from smartsuite.
 endef
 
-# uses GNU configure
+ifeq ($(CONFIG_USE_UCLIBCXX),y)
+  UCXXCFLAGS:=-fno-builtin -fno-rtti -nostdinc++
+  UCXXCPPFLAGS:=-I$(STAGING_DIR)/usr/include/uClibc++
+  UCXXLIBS:=-nodefaultlibs -lc -luClibc++
+endif
 
 CONFIGURE_VARS += \
-       CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
-       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
+       CXXFLAGS="$$$$CXXFLAGS $(UCXXCFLAGS)" \
+       CPPFLAGS="$$$$CPPFLAGS $(UCXXCPPFLAGS) -I$(LINUX_DIR)/include" \
        LDFLAGS="$$$$LDFLAGS" \
-       LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S) -lc" \
+       LIBS="$(UCXXLIBS) -lm $(LIBGCC_S) -lc" \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
index b904fa4e01a2caaae50fe9d7a876552a1dd09daf..cbba3ed51c2bb4cc625ced5dcd7bf357c7a71d2e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=squashfs-tools
 PKG_VERSION:=4.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 
@@ -69,6 +69,8 @@ endif
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)/squashfs-tools \
                CC="$(TARGET_CC)" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+               EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
                $(MAKE_FLAGS) \
                mksquashfs unsquashfs
 endef