projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 476039e)
Merge pull request #7850 from commodo/netatalk
authorTed Hess <thess@kitschensync.net>
Wed, 2 Jan 2019 18:45:39 +0000 (13:45 -0500)
committerGitHub <noreply@github.com>
Wed, 2 Jan 2019 18:45:39 +0000 (13:45 -0500)
netatalk: bump to version 3.1.12

lang/python/python3-version.mk patch | blob | history
libs/libgphoto2/Makefile patch | blob | history
net/nft-qos/Makefile patch | blob | history
net/nft-qos/files/nft-qos-monitor.hotplug patch | blob | history
net/strongswan/Makefile patch | blob | history
net/strongswan/patches/305-minimal_dh_plugin.patch patch | blob | history
net/vpnc/Makefile patch | blob | history
net/vpnc/patches/110-openssl-deprecated.patch [new file with mode: 0644] patch | blob
utils/findutils/Makefile patch | blob | history

diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk
index 18d826d0c09e2a3e7afd9bc29c9bbd012fe07fff..abef3f2ca3a49b29ff23074eed614a92ad3ce26a 100644 (file)
--- a/lang/python/python3-version.mk
+++ b/lang/python/python3-version.mk
@@ -12,8 +12,8 @@ PYTHON3_VERSION_MICRO:=2
 
 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
 
-PYTHON3_SETUPTOOLS_PKG_RELEASE:=2
-PYTHON3_PIP_PKG_RELEASE:=2
+PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
+PYTHON3_PIP_PKG_RELEASE:=1
 
-PYTHON3_SETUPTOOLS_VERSION:=39.0.1
-PYTHON3_PIP_VERSION:=10.0.1
+PYTHON3_SETUPTOOLS_VERSION:=40.6.2
+PYTHON3_PIP_VERSION:=18.1
diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index caaeebd429101c710717c6fd275d6c049a4c2203..c0d3d88e3ce9d9a52210c38c26685e568e6f2e62 100644 (file)
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2006-2012 OpenWrt.org
-# Copyright (C) 2017-2018 Leonardo Medici
+# Copyright (C) 2017-2019 Leonardo Medici
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgphoto2
-PKG_VERSION:=2.5.21
+PKG_VERSION:=2.5.22
 PKG_RELEASE:=1
 PORT_VERSION:=0.12.0
 PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_HASH:=c5572b1a52af32a40ca6a014682f7548bfb58d47109ad77fba29ec295b448bb1
+PKG_HASH:=15d7327aa9a986af1e1dbfd8f15ba81352b67450d30e44562ce768ff9435ce58
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING
 
diff --git a/net/nft-qos/Makefile b/net/nft-qos/Makefile
index 3ec2b56011c60c51181f04ba29deb41f6365eca6..6cc93560c85a5701325c9e2714f19562f186c00c 100644 (file)
--- a/net/nft-qos/Makefile
+++ b/net/nft-qos/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nft-qos
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 
diff --git a/net/nft-qos/files/nft-qos-monitor.hotplug b/net/nft-qos/files/nft-qos-monitor.hotplug
index df04fa6d088a389f5bdd482947d70c5d31a6a9ab..e263649b140c0fea8306688af829b1f5550b2bce 100644 (file)
--- a/net/nft-qos/files/nft-qos-monitor.hotplug
+++ b/net/nft-qos/files/nft-qos-monitor.hotplug
@@ -8,6 +8,14 @@
 logger -t nft-qos-monitor "ACTION=$ACTION, MACADDR=$MACADDR, IPADDR=$IPADDR, HOSTNAME=$HOSTNAME"
 
 case "$ACTION" in
-       add | update) qosdef_init_env && qosdef_monitor_add $MACADDR $IPADDR $HOSTNAME;;
-       remove) qosdef_init_env && qosdef_monitor_del $MACADDR $IPADDR $HOSTNAME;;
+       add | update)
+               qosdef_init_env
+               qosdef_init_monitor
+               qosdef_monitor_add $MACADDR $IPADDR $HOSTNAME
+       ;;
+       remove)
+               qosdef_init_env
+               qosdef_init_monitor
+               qosdef_monitor_del $MACADDR $IPADDR $HOSTNAME
+       ;;
 esac
diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index 60c4fe9a4a1a65f099e11265619594f91b19e3b7..396b3a5f0ae7df6abd151abe8961a95adc860d66 100644 (file)
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strongswan
-PKG_VERSION:=5.7.1
+PKG_VERSION:=5.7.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/ http://download2.strongswan.org/
-PKG_HASH:=006f9c9126e2a2f4e7a874b5e1bd2abec1bbbb193c8b3b3a4c6ccd8c2d454bec
+PKG_HASH:=308e3ba76e2ce2da070e48fcebbe1fa923a27cc71e43bf63917e6f2a889ecc70
 PKG_LICENSE:=GPL-2.0+
 PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
 
diff --git a/net/strongswan/patches/305-minimal_dh_plugin.patch b/net/strongswan/patches/305-minimal_dh_plugin.patch
index 1dab1140c13c9bae53200f6e5ffd1820d6fd5a28..187549f5dd57b36aad789bc56b0842c9da39782a 100644 (file)
--- a/net/strongswan/patches/305-minimal_dh_plugin.patch
+++ b/net/strongswan/patches/305-minimal_dh_plugin.patch
@@ -8,7 +8,7 @@
  ARG_DISBL_SET([curve25519],     [disable Curve25519 Diffie-Hellman plugin.])
  ARG_DISBL_SET([hmac],           [disable HMAC crypto implementation plugin.])
  ARG_ENABL_SET([md4],            [enable MD4 software implementation plugin.])
-@@ -1410,6 +1411,7 @@ ADD_PLUGIN([botan],                [s ch
+@@ -1413,6 +1414,7 @@ ADD_PLUGIN([botan],                [s ch
  ADD_PLUGIN([af-alg],               [s charon scepclient pki scripts medsrv attest nm cmd aikgen])
  ADD_PLUGIN([fips-prf],             [s charon nm cmd])
  ADD_PLUGIN([gmp],                  [s charon scepclient pki scripts manager medsrv attest nm cmd aikgen fuzz])
@@ -16,7 +16,7 @@
  ADD_PLUGIN([curve25519],           [s charon pki scripts nm cmd])
  ADD_PLUGIN([agent],                [s charon nm cmd])
  ADD_PLUGIN([keychain],             [s charon cmd])
-@@ -1550,6 +1552,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x
+@@ -1553,6 +1555,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x
  AM_CONDITIONAL(USE_MGF1, test x$mgf1 = xtrue)
  AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue)
  AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue)
@@ -24,7 +24,7 @@
  AM_CONDITIONAL(USE_CURVE25519, test x$curve25519 = xtrue)
  AM_CONDITIONAL(USE_RDRAND, test x$rdrand = xtrue)
  AM_CONDITIONAL(USE_AESNI, test x$aesni = xtrue)
-@@ -1824,6 +1827,7 @@ AC_CONFIG_FILES([
+@@ -1827,6 +1830,7 @@ AC_CONFIG_FILES([
        src/libstrongswan/plugins/mgf1/Makefile
        src/libstrongswan/plugins/fips_prf/Makefile
        src/libstrongswan/plugins/gmp/Makefile
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index 2941aecd5b98f8434e336671a4873fd78f69bc43..6d8516d376f95e4dca2151cb2924370ce7570042 100644 (file)
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=vpnc
 PKG_REV:=550
 PKG_VERSION:=0.5.3.r$(PKG_REV)
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://svn.unix-ag.uni-kl.de/vpnc/trunk/
diff --git a/net/vpnc/patches/110-openssl-deprecated.patch b/net/vpnc/patches/110-openssl-deprecated.patch
new file mode 100644 (file)
index 0000000..c3d87ee
--- /dev/null
+++ b/net/vpnc/patches/110-openssl-deprecated.patch
@@ -0,0 +1,10 @@
+--- a/crypto-openssl.c
++++ b/crypto-openssl.c
+@@ -20,6 +20,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <openssl/pem.h>
++#include <openssl/rsa.h>
+ #include "config.h"
+ #include "sysdep.h"
+ #include "crypto.h"
diff --git a/utils/findutils/Makefile b/utils/findutils/Makefile
index cfb4ad800eff2ff6ca98b7c4264269f411f53a80..64d1533f9e37e6970f3282dcf04a792464166fa3 100644 (file)
--- a/utils/findutils/Makefile
+++ b/utils/findutils/Makefile
@@ -8,7 +8,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=findutils
 PKG_VERSION:=4.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
+
+PKG_LICENSE:=GPL-3.0+
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@@ -20,9 +22,10 @@ PKG_INSTALL:=1
 include $(INCLUDE_DIR)/package.mk
 
 define Package/findutils/Default
-       TITLE:=GNU findutils
+       TITLE:=GNU Find Utilities
        SECTION:=utils
        CATEGORY:=Utilities
+       URL:=https://www.gnu.org/software/findutils/
 endef
 
 define Package/findutils/description/Default
@@ -32,56 +35,55 @@ sufficient functionality, but some users may want or need
 the full functionality of the GNU tools.
 endef
 
-define Package/findutils-find
+define Package/findutils
        $(call Package/findutils/Default)
-       TITLE+= (find)
+       TITLE+= (all)
+       DEPENDS:= \
+       +findutils-find \
+       +findutils-xargs \
+       +findutils-locate
 endef
 
-define Package/findutils-find/description
-$(call Package/findutils/description/Default)
-This package contains the find utility
-endef
-
-define Package/findutils-xargs
+define Package/findutils-find
        $(call Package/findutils/Default)
-       TITLE := (xargs)
-endef
-
-define Package/findutils-xargs/description
-$(call Package/findutils/description/Default)
-This package contains the xargs utility
+       TITLE+= - find utility
 endef
 
 define Package/findutils-locate
        $(call Package/findutils/Default)
-       TITLE := (locate)
+       TITLE+= - locate and updatedb utility
 endef
 
-define Package/findutils-locate/description
-$(call Package/findutils/description/Default)
-This package contains the locate and related updatedb utility
+define Package/findutils-xargs
+       $(call Package/findutils/Default)
+       TITLE+= - xargs utility
 endef
 
 CONFIGURE_ARGS += --localstatedir=/srv/var
 CONFIGURE_VARS += ac_cv_path_SORT=sort
 
-define Package/findutils-find/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/bin/    
+define Package/findutils/install
+       true
 endef
 
-define Package/findutils-xargs/install
+define Package/findutils-find/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/bin/   
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/bin/
 endef
 
 define Package/findutils-locate/install
        $(INSTALL_DIR) $(1)/usr/bin $(1)/srv/var
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/locate $(1)/usr/bin/  
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/updatedb $(1)/usr/bin/        
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/locate $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/updatedb $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/
 endef
 
+define Package/findutils-xargs/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,findutils))
 $(eval $(call BuildPackage,findutils-find))
-$(eval $(call BuildPackage,findutils-xargs))
 $(eval $(call BuildPackage,findutils-locate))
+$(eval $(call BuildPackage,findutils-xargs))
Mirror of packages feed