pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/netatalk3 Update to netatalk-3.1.11
details: https://anonhg.NetBSD.org/pkgsrc/rev/60855a75b865
branches: trunk
changeset: 363145:60855a75b865
user: szptvlfn <szptvlfn%pkgsrc.org@localhost>
date: Fri Jun 02 12:19:07 2017 +0000
description:
Update to netatalk-3.1.11
pkgsrc changes:
removed patches:
patch-bin_afppasswd_afppasswd.c
patch-etc_uams_uams__randnum.c
https://github.com/Netatalk/Netatalk/commit/ee2dee23560ac3c059b020b1ec2fbd3c0ef1318f
patch-include_atalk_acl.h
https://github.com/Netatalk/Netatalk/commit/d48ecb55ac4c916cd78bbaf4de53a04abf6d47fb
regen patch:
patch-config_pam_Makefile.in
changelog(from NEWS):
Changes in 3.1.11
================
* NEW: Global option "zeroconf name", FR#99
* NEW: show Zeroconf support by "netatalk -V", FR#100
* UPD: gentoo: Switch openrc init script to openrc-run, GitHub#77
* FIX: log message: name of function doese not match, GitHub#78
* UPD: volume capacity reporting to match Samba behavior, GitHub#83
* FIX: debian: sysv init status command exits with proper exit code, GitHub#84
* FIX: dsi_stream_read: len:0, unexpected EOF, GitHub#82
* UPD: dhx uams: OpenSSL 1.1 support, GitHub#87
Changes in 3.1.10
================
* FIX: cannot build when ldap is not defined, bug #630
* FIX: SIGHUP can cause core dump when mdns is enabled, bug #72
* FIX: Solaris: stale pid file puts netatalk into maintenance mode, bug #73
* FIX: dsi_stream_read: len:0, unexpected EOF, bug #633
Changes in 3.1.9
================
* FIX: afpd: fix "admin group" option
* NEW: afpd: new options "force user" and "force group"
* FIX: listening on IPv6 wildcard address may fail if IPv6 is
disabled, bug #606
* NEW: LibreSSL support, FR #98
* FIX: cannot build when acl is not defined, bug #574
* UPD: configure option "--with-init-style=" for Gentoo.
"gentoo" is renamed to "gentoo-openrc".
"gentoo-openrc" is same as "openrc".
"gentoo-systemd" is same as "systemd".
* NEW: configure option "--with-dbus-daemon=PATH" for Spotlight feature
* UPD: use "tracker daemon" command instead of "tracker-control" command
if Gnome Tracker is the recent version.
* NEW: configure options "--enable-rpath" and "--disable-rpath" which
can be used to force setting of RPATH (default on Solaris/NetBSD)
or disable it.
* NEW: configure option "--with-tracker-install-prefix" allows setting
an alternate install prefix for tracker when cross-compiling.
* UPD: asip-status.pl: IPv6 support
* UPD: asip-status.pl: show GSS-UAM SPNEGO blob
* FIX: afpd: don't use network IDs without LDAP, bug #621
* FIX: afpd: reading from file may fail, bug #619
* NEW: AFP clients should not be able to copy or manipulate special
extended attributes set by NFS and SMB servers on Solaris, issue #36
* FIX: ad: ad cp may crash, bug #622
* UPD: Update Unicode support to version 9.0.0
Changes in 3.1.8
================
* FIX: CNID/MySQL: Quote UUID table names.
https://sourceforge.net/p/netatalk/bugs/585/
* FIX: Crash in cnid_metad, bug #593
* UPD: Update Unicode support to version 8.0.0
* FIX: larger server side copyfile buffer for improved IO performance,
bug #599
* NEW: afpd: new option "ea = samba". Use Samba vfs_streams_xattr
compatible xattrs which means adding a 0 byte at the end of
xattrs.
* FIX: remove #541 workaround patch. There was this problem with only early
Fedora 20.
* FIX: rpmbuild fails on Fedora x86_64, bug #598
* FIX: Listen on IPv6 wildcard address by default, bug #602
* FIX: FCE protocol version 1 packets, bug #603
* UPD: Update list of BerkeleyDB versions searched at configure time
diffstat:
net/netatalk3/Makefile | 5 +-
net/netatalk3/distinfo | 15 +-
net/netatalk3/patches/patch-bin_afppasswd_afppasswd.c | 42 -----
net/netatalk3/patches/patch-config_pam_Makefile.in | 12 +-
net/netatalk3/patches/patch-etc_uams_uams__randnum.c | 133 ------------------
net/netatalk3/patches/patch-include_atalk_acl.h | 14 -
6 files changed, 14 insertions(+), 207 deletions(-)
diffs (274 lines):
diff -r ff85ac655f58 -r 60855a75b865 net/netatalk3/Makefile
--- a/net/netatalk3/Makefile Fri Jun 02 08:39:15 2017 +0000
+++ b/net/netatalk3/Makefile Fri Jun 02 12:19:07 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/05/19 13:29:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.5 2017/06/02 12:19:07 szptvlfn Exp $
-DISTNAME= netatalk-3.1.7
+DISTNAME= netatalk-3.1.11
PKGNAME= ${DISTNAME:C/-/3-/}
-PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
diff -r ff85ac655f58 -r 60855a75b865 net/netatalk3/distinfo
--- a/net/netatalk3/distinfo Fri Jun 02 08:39:15 2017 +0000
+++ b/net/netatalk3/distinfo Fri Jun 02 12:19:07 2017 +0000
@@ -1,21 +1,18 @@
-$NetBSD: distinfo,v 1.3 2016/11/07 12:47:13 christos Exp $
+$NetBSD: distinfo,v 1.4 2017/06/02 12:19:07 szptvlfn Exp $
-SHA1 (netatalk-3.1.7.tar.bz2) = d4077a9496beae766ab1e4f28afa22e5c96514f0
-RMD160 (netatalk-3.1.7.tar.bz2) = 0fddc514a0654ffa546424d33b0b02f2f147f7be
-SHA512 (netatalk-3.1.7.tar.bz2) = e8b22a156235cb93830ed5045e28346613e354fd830e742b2f7c1fc9302f9bdfce7fb2cc329ce8dfd1442857f96e9e54119a4ac177b6855af9143e64fb2208e7
-Size (netatalk-3.1.7.tar.bz2) = 1780078 bytes
+SHA1 (netatalk-3.1.11.tar.bz2) = 5aa7900e6f7de3c7ee812aa1130c1245d1974586
+RMD160 (netatalk-3.1.11.tar.bz2) = d0b671662afb642dc6bdfb44688fd459da5e7415
+SHA512 (netatalk-3.1.11.tar.bz2) = 330e584f34b5f5e8714b3eca8e11adb93134cc0afa73e9bc25ddadcf3e9a96779a2979dfc08a64d343b148bc2d4e0e0f25b08d9c46d6b68057611d04ecfd06ea
+Size (netatalk-3.1.11.tar.bz2) = 1812227 bytes
SHA1 (patch-bin_ad_ad__cp.c) = bd2191a7a2731e6032f97dc66688175fc84275cc
-SHA1 (patch-bin_afppasswd_afppasswd.c) = 4c2d5e5036dc5508267b113fb107a34c3d875006
SHA1 (patch-config.h.in) = bd9e735c6d1c8bb8a1534f6674fa6358b29922c1
SHA1 (patch-config_Makefile.in) = 81fff584e5cb98537a4fa671fb551ad0258ba092
-SHA1 (patch-config_pam_Makefile.in) = b76b6408ca7ad93d195acd70e1029b3b6aa000fc
+SHA1 (patch-config_pam_Makefile.in) = 8f69225c333b327b4c57ef12994666cc521e5c70
SHA1 (patch-distrib_initscripts_Makefile.in) = fbeffa06a051fb61819d09e0396695cbe564780e
SHA1 (patch-distrib_initscripts_netatalk.xml.tmpl) = dd7591e12eca3c1e7d7bc768cd1e060979dc383e
SHA1 (patch-etc_afpd_quota.c) = bd93ed958229f73898cdc424a582e14186ac703c
SHA1 (patch-etc_cnid__dbd_cnid__metad.c) = 6c28332ca3e11d11f3b5bb13fa01783dbb94c30f
SHA1 (patch-etc_netatalk_netatalk.c) = 2bdbfc035e4bea9859cf970cd6b9a6503244185e
-SHA1 (patch-etc_uams_uams__randnum.c) = ec83d4b849aa9ced574b8ede29c0ae27ecd652e0
-SHA1 (patch-include_atalk_acl.h) = 88c8aaec351099764b171bc7d160ac5b36b2f873
SHA1 (patch-include_atalk_util.h) = a7a0763c5866288ad89a8b6b90c71767ee4d9d64
SHA1 (patch-libatalk_util_getiface.c) = 1a46bd695c96e0666b6f45493eb44501c0f4e0b5
SHA1 (patch-macros_quota-check.m4) = a6502693ae8c7218b7c4426b134e0aa590412e1f
diff -r ff85ac655f58 -r 60855a75b865 net/netatalk3/patches/patch-bin_afppasswd_afppasswd.c
--- a/net/netatalk3/patches/patch-bin_afppasswd_afppasswd.c Fri Jun 02 08:39:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-bin_afppasswd_afppasswd.c,v 1.2 2016/11/07 12:46:52 christos Exp $
-
-Use the OpenSSL des.h which is more portable.
-
---- bin/afppasswd/afppasswd.c.orig 2013-04-09 12:56:17.000000000 +0000
-+++ bin/afppasswd/afppasswd.c
-@@ -35,7 +35,7 @@
- #include <pwd.h>
- #include <arpa/inet.h>
-
--#include <des.h>
-+#include <openssl/des.h>
-
- #ifdef USE_CRACKLIB
- #include <crack.h>
-@@ -65,7 +65,7 @@ static char buf[MAXPATHLEN + 1];
- static void convert_passwd(char *buf, char *newpwd, const int keyfd)
- {
- uint8_t key[HEXPASSWDLEN];
-- Key_schedule schedule;
-+ DES_key_schedule schedule;
- unsigned int i, j;
-
- if (!newpwd) {
-@@ -84,14 +84,14 @@ static void convert_passwd(char *buf, ch
- key[j] = (unhex(key[i]) << 4) | unhex(key[i + 1]);
- if (j <= DES_KEY_SZ)
- memset(key + j, 0, sizeof(key) - j);
-- key_sched((C_Block *) key, schedule);
-+ DES_key_sched((DES_cblock *) key, &schedule);
- memset(key, 0, sizeof(key));
- if (newpwd) {
-- ecb_encrypt((C_Block *) newpwd, (C_Block *) newpwd, schedule,
-+ DES_ecb_encrypt((DES_cblock *) newpwd, (DES_cblock *) newpwd, &schedule,
- DES_ENCRYPT);
- } else {
- /* decrypt the password */
-- ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *) buf, (DES_cblock *) buf, &schedule, DES_DECRYPT);
- }
- memset(&schedule, 0, sizeof(schedule));
- }
diff -r ff85ac655f58 -r 60855a75b865 net/netatalk3/patches/patch-config_pam_Makefile.in
--- a/net/netatalk3/patches/patch-config_pam_Makefile.in Fri Jun 02 08:39:15 2017 +0000
+++ b/net/netatalk3/patches/patch-config_pam_Makefile.in Fri Jun 02 12:19:07 2017 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-config_pam_Makefile.in,v 1.1 2016/11/07 00:41:57 christos Exp $
+$NetBSD: patch-config_pam_Makefile.in,v 1.2 2017/06/02 12:19:07 szptvlfn Exp $
Do not mess with the base system, we install the pam config to
examples/netatalk instead.
---- config/pam/Makefile.in.orig 2014-08-29 06:33:35.000000000 -0400
-+++ config/pam/Makefile.in 2016-11-06 09:23:14.358979157 -0500
-@@ -397,25 +397,9 @@
+--- config/pam/Makefile.in.orig 2017-01-23 01:23:45.000000000 +0900
++++ config/pam/Makefile.in 2017-06-02 19:34:25.557582142 +0900
+@@ -440,25 +440,9 @@
-rm -rf .libs _libs
install-pamDATA: $(pam_DATA)
@$(NORMAL_INSTALL)
@@ -28,6 +28,6 @@
- @list='$(pam_DATA)'; test -n "$(pamdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(pamdir)'; $(am__uninstall_files_from_dir)
- tags: TAGS
- TAGS:
+ tags TAGS:
+ ctags CTAGS:
diff -r ff85ac655f58 -r 60855a75b865 net/netatalk3/patches/patch-etc_uams_uams__randnum.c
--- a/net/netatalk3/patches/patch-etc_uams_uams__randnum.c Fri Jun 02 08:39:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-$NetBSD: patch-etc_uams_uams__randnum.c,v 1.2 2016/11/07 12:46:52 christos Exp $
-
-Use the OpenSSL des routines for portability
-
---- etc/uams/uams_randnum.c.orig 2014-01-04 16:42:35.000000000 +0100
-+++ etc/uams/uams_randnum.c 2015-08-10 16:38:08.000000000 +0200
-@@ -24,18 +24,18 @@
- #include <atalk/afp.h>
- #include <atalk/uam.h>
-
-
--#include <des.h>
-+#include <openssl/des.h>
-
- #ifdef USE_CRACKLIB
- #include <crack.h>
- #endif /* USE_CRACKLIB */
-
- #define PASSWDLEN 8
-
--static C_Block seskey;
--static Key_schedule seskeysched;
-+static DES_cblock seskey;
-+static DES_key_schedule seskeysched;
- static struct passwd *randpwd;
- static uint8_t randbuf[8];
-
- /* hash to a 16-bit number. this will generate completely harmless
-@@ -123,9 +123,9 @@
- const int set)
- {
- uint8_t key[DES_KEY_SZ*2];
- char buf[MAXPATHLEN + 1], *p;
-- Key_schedule schedule;
-+ DES_key_schedule schedule;
- FILE *fp;
- unsigned int i, j;
- int keyfd = -1, err = 0;
- off_t pos;
-@@ -180,19 +180,20 @@
- for (i = j = 0; i < strlen((char *) key); i += 2, j++)
- key[j] = (unhex(key[i]) << 4) | unhex(key[i + 1]);
- if (j <= DES_KEY_SZ)
- memset(key + j, 0, sizeof(key) - j);
-- key_sched((C_Block *) key, schedule);
-+ DES_key_sched((DES_cblock *) key, &schedule);
- memset(key, 0, sizeof(key));
-
- if (set) {
- /* NOTE: this takes advantage of the fact that passwd doesn't
- * get used after this call if it's being set. */
-- ecb_encrypt((C_Block *) passwd, (C_Block *) passwd, schedule,
-- DES_ENCRYPT);
-+ DES_ecb_encrypt((DES_cblock *) passwd, (DES_cblock *) passwd,
-+ &schedule, DES_ENCRYPT);
- } else {
- /* decrypt the password */
-- ecb_encrypt((C_Block *) p, (C_Block *) p, schedule, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *) p, (DES_cblock *) p,
-+ &schedule, DES_DECRYPT);
- }
- memset(&schedule, 0, sizeof(schedule));
- }
-
-@@ -339,12 +340,12 @@
- ibuf += sizeof(sessid);
-
- /* encrypt. this saves a little space by using the fact that
- * des can encrypt in-place without side-effects. */
-- key_sched((C_Block *) seskey, seskeysched);
-+ DES_key_sched((DES_cblock *) seskey, &seskeysched);
- memset(seskey, 0, sizeof(seskey));
-- ecb_encrypt((C_Block *) randbuf, (C_Block *) randbuf,
-- seskeysched, DES_ENCRYPT);
-+ DES_ecb_encrypt((DES_cblock *) randbuf, (DES_cblock *) randbuf,
-+ &seskeysched, DES_ENCRYPT);
- memset(&seskeysched, 0, sizeof(seskeysched));
-
- /* test against what the client sent */
- if (memcmp( randbuf, ibuf, sizeof(randbuf) )) { /* != */
-@@ -383,12 +384,12 @@
- for (i = 0; i < sizeof(seskey); i++)
- seskey[i] <<= 1;
-
- /* encrypt randbuf */
-- key_sched((C_Block *) seskey, seskeysched);
-+ DES_key_sched((DES_cblock *) seskey, &seskeysched);
- memset(seskey, 0, sizeof(seskey));
-- ecb_encrypt( (C_Block *) randbuf, (C_Block *) randbuf,
-- seskeysched, DES_ENCRYPT);
-+ DES_ecb_encrypt( (DES_cblock *) randbuf, (DES_cblock *) randbuf,
-+ &seskeysched, DES_ENCRYPT);
-
- /* test against client's reply */
- if (memcmp(randbuf, ibuf, sizeof(randbuf))) { /* != */
- memset(randbuf, 0, sizeof(randbuf));
-@@ -398,10 +399,10 @@
- ibuf += sizeof(randbuf);
- memset(randbuf, 0, sizeof(randbuf));
-
- /* encrypt client's challenge and send back */
-- ecb_encrypt( (C_Block *) ibuf, (C_Block *) rbuf,
-- seskeysched, DES_ENCRYPT);
-+ DES_ecb_encrypt( (DES_cblock *) ibuf, (DES_cblock *) rbuf,
-+ &seskeysched, DES_ENCRYPT);
- memset(&seskeysched, 0, sizeof(seskeysched));
- *rbuflen = sizeof(randbuf);
-
- *uam_pwd = randpwd;
-@@ -434,17 +435,19 @@
- sizeof(seskey), 0)) != AFP_OK)
- return err;
-
- /* use old passwd to decrypt new passwd */
-- key_sched((C_Block *) seskey, seskeysched);
-+ DES_key_sched((DES_cblock *) seskey, &seskeysched);
- ibuf += PASSWDLEN; /* new passwd */
- ibuf[PASSWDLEN] = '\0';
-- ecb_encrypt( (C_Block *) ibuf, (C_Block *) ibuf, seskeysched, DES_DECRYPT);
-+ DES_ecb_encrypt( (DES_cblock *) ibuf, (DES_cblock *) ibuf,
-+ &seskeysched, DES_DECRYPT);
-
- /* now use new passwd to decrypt old passwd */
-- key_sched((C_Block *) ibuf, seskeysched);
-+ DES_key_sched((DES_cblock *) ibuf, &seskeysched);
- ibuf -= PASSWDLEN; /* old passwd */
-- ecb_encrypt((C_Block *) ibuf, (C_Block *) ibuf, seskeysched, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *) ibuf, (DES_cblock *) ibuf, &
-+ seskeysched, DES_DECRYPT);
- if (memcmp(seskey, ibuf, sizeof(seskey)))
- err = AFPERR_NOTAUTH;
- else if (memcmp(seskey, ibuf + PASSWDLEN, sizeof(seskey)) == 0)
- err = AFPERR_PWDSAME;
diff -r ff85ac655f58 -r 60855a75b865 net/netatalk3/patches/patch-include_atalk_acl.h
--- a/net/netatalk3/patches/patch-include_atalk_acl.h Fri Jun 02 08:39:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-include_atalk_acl.h,v 1.2 2016/11/07 12:46:52 christos Exp $
-
-Provide O_IGNORE for the ones with no ACL support
-
---- include/atalk/acl.h.orig 2014-07-03 01:16:05.000000000 -0400
-+++ include/atalk/acl.h 2016-11-06 11:20:13.660540431 -0500
-@@ -61,6 +61,7 @@
- #else /* HAVE_ACLS=no */
-
- #define O_NETATALK_ACL 0
-+#define O_IGNORE 0
- #define chmod_acl chmod
-
- #endif /* HAVE_ACLS */
Home |
Main Index |
Thread Index |
Old Index