pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/netatalk22
Module Name: pkgsrc
Committed By: hauke
Date: Tue Jan 10 22:07:33 UTC 2023
Modified Files:
pkgsrc/net/netatalk22: Makefile distinfo options.mk
pkgsrc/net/netatalk22/patches: patch-config_Makefile.in patch-configure
patch-etc_uams_uams__dhx__passwd.c
Removed Files:
pkgsrc/net/netatalk22/patches: patch-config_afpd.conf.tmpl
patch-distrib_initscripts_Makefile.in patch-etc_afpd_afp__options.c
patch-etc_atalkd_main.c patch-etc_cnid_dbd_cmd_dbd_scanvol.c
patch-etc_papd_file.c patch-etc_papd_file.h patch-etc_papd_magics.c
patch-etc_papd_print_cups.c patch-etc_uams_uams__dhx__pam.c
patch-etc_uams_uams__randnum.c patch-include_atalk_ldapconfig.h
patch-libatalk_asp_asp__getsess.c patch-libatalk_bstring_bstrlib.c
patch-man_man5_afpd.conf.5.tmpl
Log Message:
Update net/netatalk22 to v2.2.7.
>From the upstream ChangeLog:
[2.2] Fix 'multiple definition' compile time errors by @rdmark in #136
[2.2] Remove bitrotted code by @rdmark in #139
[2.2] Fixes for the OpenSSL 1.1 API; add OpenSSL 1.0 backwards compat by @rdmark in #142
[2.2] Install afp_ldap.conf based on LDAP support, not availability of ACLs. by @rdmark in #143
[2.2] Resolve gcc 10 compile time warnings on Linux by @rdmark in #165
[2.2] Downstream patches for NetBSD compatibility by @rdmark in #148
[2.2] Make timelord work on non-big-endian systems; ability to sync localtime by @rdmark in #151
[2.2] Resolve papd compile time errors due to deprecated CUPS calls by @rdmark in #152
[2.2] Resolve automake warnings running bootstrap by @rdmark in #153
[2.2] Handle special FIRSTNET behavior on NetBSD by @rdmark in #154
[2.2] papd patches for compatibility with older Apple LaserWriter drivers on Mac and GS/OS by @rdmark in #156
[2.2] Allow non-unicode volume to be scanned by the repair tool. by @rdmark in #158
[2.2] Update init script templates to start/stop a2boot daemon. by @rdmark in #160
[2.2] Backport Netatalk 3 patches by @rdmark in #161
[2.2] papd: Send replies to client when printing to prompt more data by @rdmark in #162
[2.2] afpd: Add option to disable afp session tickles by @rdmark in #163
[2.2] Update for Unicode 14 by @rdmark in #164
[2.2] Made the AsanteTalk bridge consistently start up in AppleTalk Phase 2$A!-(B by @rdmark in #166
[2.2] Introduce fully functional systemd unit configurations for all daemons by @rdmark in #167
[2.2] General stability patches by @rdmark in #168
Fix some compile errors by @JensKSP in #176
Package changes:
Distfile has been moved to github
Clean up unused PLIST variables
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/netatalk22/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/netatalk22/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/netatalk22/options.mk
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/net/netatalk22/patches/patch-config_Makefile.in \
pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c
cvs rdiff -u -r1.2 -r0 \
pkgsrc/net/netatalk22/patches/patch-config_afpd.conf.tmpl \
pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in \
pkgsrc/net/netatalk22/patches/patch-etc_afpd_afp__options.c \
pkgsrc/net/netatalk22/patches/patch-etc_papd_magics.c \
pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c \
pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c \
pkgsrc/net/netatalk22/patches/patch-libatalk_asp_asp__getsess.c \
pkgsrc/net/netatalk22/patches/patch-man_man5_afpd.conf.5.tmpl
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk22/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/net/netatalk22/patches/patch-etc_atalkd_main.c \
pkgsrc/net/netatalk22/patches/patch-etc_cnid_dbd_cmd_dbd_scanvol.c \
pkgsrc/net/netatalk22/patches/patch-etc_papd_file.c \
pkgsrc/net/netatalk22/patches/patch-etc_papd_file.h \
pkgsrc/net/netatalk22/patches/patch-libatalk_bstring_bstrlib.c
cvs rdiff -u -r1.3 -r0 \
pkgsrc/net/netatalk22/patches/patch-etc_papd_print_cups.c \
pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/netatalk22/Makefile
diff -u pkgsrc/net/netatalk22/Makefile:1.49 pkgsrc/net/netatalk22/Makefile:1.50
--- pkgsrc/net/netatalk22/Makefile:1.49 Tue Jan 3 17:38:02 2023
+++ pkgsrc/net/netatalk22/Makefile Tue Jan 10 22:07:33 2023
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2023/01/03 17:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2023/01/10 22:07:33 hauke Exp $
-DISTNAME= netatalk-2.2.6
+DISTNAME= netatalk-2.2.7
PKGNAME= ${DISTNAME:C/-/22-/}
-PKGREVISION= 33
CATEGORIES= net print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/netatalk-2-2-7/
#PATCHFILES= patch-adv1tov2.c
PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/
@@ -59,14 +57,12 @@ SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= etc/psf/etc2ps.sh
SUBST_SED.paths= -e 's,^\(DVIPS="*\)/usr\(/bin\),\1${PREFIX}\2,'
-PLIST_VARS+= rcd
.if ${OPSYS} == "NetBSD"
CONFIGURE_ARGS+= --enable-netbsd
RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad
. for f in ${RCD_SCRIPTS}
RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f}
. endfor
-PLIST.rcd= yes
.endif
PLIST_VARS+= ea
Index: pkgsrc/net/netatalk22/distinfo
diff -u pkgsrc/net/netatalk22/distinfo:1.13 pkgsrc/net/netatalk22/distinfo:1.14
--- pkgsrc/net/netatalk22/distinfo:1.13 Fri Jan 28 21:18:18 2022
+++ pkgsrc/net/netatalk22/distinfo Tue Jan 10 22:07:33 2023
@@ -1,23 +1,8 @@
-$NetBSD: distinfo,v 1.13 2022/01/28 21:18:18 nat Exp $
+$NetBSD: distinfo,v 1.14 2023/01/10 22:07:33 hauke Exp $
-BLAKE2s (netatalk-2.2.6.tar.bz2) = 22951265586889d7ac4f01ade0707f1e63389a14623beec787f587e4ef74b891
-SHA512 (netatalk-2.2.6.tar.bz2) = 74aa3415a43293a8804b00b0eda564d6536310e59c3f0d067d634db89f4d612a1dfd932df18607c32b948922ae032bc25471e21635ab149a78629ff95c341f47
-Size (netatalk-2.2.6.tar.bz2) = 1301887 bytes
-SHA1 (patch-config_Makefile.in) = e6b020cf4cf11572a648bee7de0937add1948ea8
-SHA1 (patch-config_afpd.conf.tmpl) = 4ff3dc9ea7af77319dc5be499e04648220022404
-SHA1 (patch-configure) = 9919625c3cd54e34ab45c6606094e12215630d33
-SHA1 (patch-distrib_initscripts_Makefile.in) = 706890f9e0aacab4d523cc1900048b7fab96f5d4
-SHA1 (patch-etc_afpd_afp__options.c) = ab65d03c61f8be65e8afc3bd102e5e13e642f1b9
-SHA1 (patch-etc_atalkd_main.c) = bdd452b9ca62e506d056e3818fb7f5b54a9d38c5
-SHA1 (patch-etc_cnid_dbd_cmd_dbd_scanvol.c) = df844b4047e614a3fd44cbcea252627f6fe43b65
-SHA1 (patch-etc_papd_file.c) = 8d050430e8013501230462375c874c8188f12e73
-SHA1 (patch-etc_papd_file.h) = 2464cc27385a8300f8cc3503643db4512d5f368f
-SHA1 (patch-etc_papd_magics.c) = 3f25cb45e7a860505895c628490905fe42a1ed62
-SHA1 (patch-etc_papd_print_cups.c) = 8dada275f9525b9229a85492050de982b1e54295
-SHA1 (patch-etc_uams_uams__dhx__pam.c) = 8ed99ff32ca932367c5df7af6889db1abbde7a2e
-SHA1 (patch-etc_uams_uams__dhx__passwd.c) = 52e2862aa55268349dfc64a7d71ebc17e1b8830b
-SHA1 (patch-etc_uams_uams__randnum.c) = 0608eb6a7b43b0cc360879849c9ca0b38ffdc684
-SHA1 (patch-include_atalk_ldapconfig.h) = e69d212f45ace23773d15c122ca2e550b025f845
-SHA1 (patch-libatalk_asp_asp__getsess.c) = 0ae089ef4f882a1580298707fbeee5d519c83482
-SHA1 (patch-libatalk_bstring_bstrlib.c) = f43818328237b908166f956de464f532d578d2c4
-SHA1 (patch-man_man5_afpd.conf.5.tmpl) = 43dfb930851329e5fe77d2fae4b8b7237a3fe42c
+BLAKE2s (netatalk-2.2.7.tar.gz) = a828870c06fcec3aaf1ec4fd6c06411ecc0e687b73f4d29257743de0667798df
+SHA512 (netatalk-2.2.7.tar.gz) = fb6664b2ea700f1a8307eaf452954e2f0c3bb7d082f2df211f17a79d1fc7f3ca4dff0b805beb7b8d10fb23d749fd1990a6b07c029d89d09299677a41b8161220
+Size (netatalk-2.2.7.tar.gz) = 1849800 bytes
+SHA1 (patch-config_Makefile.in) = 37ed88693c64b5e34396da26f9d7105102ed479b
+SHA1 (patch-configure) = 6b9d73ac0c8ba4913834402a587b734d342c3830
+SHA1 (patch-etc_uams_uams__dhx__passwd.c) = a4eb368ae6f1698d906fe1ba2f1600b7a0b20539
Index: pkgsrc/net/netatalk22/options.mk
diff -u pkgsrc/net/netatalk22/options.mk:1.6 pkgsrc/net/netatalk22/options.mk:1.7
--- pkgsrc/net/netatalk22/options.mk:1.6 Fri Apr 2 09:54:26 2021
+++ pkgsrc/net/netatalk22/options.mk Tue Jan 10 22:07:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2021/04/02 09:54:26 hauke Exp $
+# $NetBSD: options.mk,v 1.7 2023/01/10 22:07:33 hauke Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam slp
@@ -12,7 +12,6 @@ CONFIGURE_ARGS+= --enable-cups
CONFIGURE_ARGS+= --disable-cups
.endif
-PLIST_VARS+= debug
.if !empty(PKG_OPTIONS:Mdebug)
# Debugging
CONFIGURE_ARGS+= --enable-debug1
@@ -22,7 +21,6 @@ CFLAGS+= -g3
INSTALL_UNSTRIPPED= yes
.endif
-PLIST_VARS+= dnssd
.if !empty(PKG_OPTIONS:Mdnssd)
.include "../../net/mDNSResponder/buildlink3.mk"
CONFIGURE_ARGS+= --enable-zeroconf
Index: pkgsrc/net/netatalk22/patches/patch-config_Makefile.in
diff -u pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.2 pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.3
--- pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.2 Fri Apr 2 09:54:26 2021
+++ pkgsrc/net/netatalk22/patches/patch-config_Makefile.in Tue Jan 10 22:07:33 2023
@@ -1,6 +1,4 @@
-$NetBSD: patch-config_Makefile.in,v 1.2 2021/04/02 09:54:26 hauke Exp $
-
-Install afp_ldap.conf based on LDAP support, not ACL support.
+$NetBSD: patch-config_Makefile.in,v 1.3 2023/01/10 22:07:33 hauke Exp $
Install config files to examples/netatalk, and leave installation to
the pkginstall framerwork.
@@ -9,15 +7,6 @@ Renamed from patch-ah
--- config/Makefile.in.orig 2017-07-09 11:27:05.000000000 +0000
+++ config/Makefile.in
-@@ -88,7 +88,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--@HAVE_ACLS_TRUE@am__append_1 = afp_ldap.conf
-+@HAVE_LDAP_TRUE@am__append_1 = afp_ldap.conf
- @USE_APPLETALK_TRUE@am__append_2 = atalkd.conf papd.conf
- subdir = config
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -759,13 +759,14 @@ uninstall-local:
rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
done
Index: pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c
diff -u pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c:1.2 pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c:1.3
--- pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c:1.2 Fri Apr 2 09:54:26 2021
+++ pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c Tue Jan 10 22:07:33 2023
@@ -1,45 +1,14 @@
-$NetBSD: patch-etc_uams_uams__dhx__passwd.c,v 1.2 2021/04/02 09:54:26 hauke Exp $
+$NetBSD: patch-etc_uams_uams__dhx__passwd.c,v 1.3 2023/01/10 22:07:33 hauke Exp $
-Adapt for new OpenSSL API.
+Don't include headers that are not shipped
---- etc/uams/uams_dhx_passwd.c.orig 2014-03-16 11:17:48.000000000 +0000
+--- etc/uams/uams_dhx_passwd.c.orig 2022-07-12 04:08:24.000000000 +0000
+++ etc/uams/uams_dhx_passwd.c
-@@ -81,6 +81,7 @@ static int pwd_login(void *obj, char *us
- struct spwd *sp;
- #endif /* SHADOWPW */
- BIGNUM *bn, *gbn, *pbn;
-+ const BIGNUM *pub_key;
- u_int16_t sessid;
- size_t i;
- DH *dh;
-@@ -144,10 +145,18 @@ static int pwd_login(void *obj, char *us
- return AFPERR_PARAM;
- }
-
-+ if (!DH_set0_pqg(dh, pbn, NULL, gbn)) {
-+ BN_free(pbn);
-+ BN_free(gbn);
-+ goto passwd_fail;
-+ }
-+
- /* generate key and make sure we have enough space */
-- dh->p = pbn;
-- dh->g = gbn;
-- if (!DH_generate_key(dh) || (BN_num_bytes(dh->pub_key) > KEYSIZE)) {
-+ if (!DH_generate_key(dh)) {
-+ goto passwd_fail;
-+ }
-+ DH_get0_key(dh, &pub_key, NULL);
-+ if (BN_num_bytes(pub_key) > KEYSIZE) {
- goto passwd_fail;
- }
-
-@@ -164,7 +173,7 @@ static int pwd_login(void *obj, char *us
- *rbuflen += sizeof(sessid);
-
- /* send our public key */
-- BN_bn2bin(dh->pub_key, (unsigned char *)rbuf);
-+ BN_bn2bin(pub_key, (unsigned char *)rbuf);
- rbuf += KEYSIZE;
- *rbuflen += KEYSIZE;
-
+@@ -37,7 +37,6 @@
+ #include <openssl/bn.h>
+ #include <openssl/dh.h>
+ #include <openssl/cast.h>
+-#include "openssl_compat.h"
+ #else /* OPENSSL_DHX */
+ #include <bn.h>
+ #include <dh.h>
Index: pkgsrc/net/netatalk22/patches/patch-configure
diff -u pkgsrc/net/netatalk22/patches/patch-configure:1.3 pkgsrc/net/netatalk22/patches/patch-configure:1.4
--- pkgsrc/net/netatalk22/patches/patch-configure:1.3 Wed Jul 12 13:56:00 2017
+++ pkgsrc/net/netatalk22/patches/patch-configure Tue Jan 10 22:07:33 2023
@@ -1,36 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2017/07/12 13:56:00 hauke Exp $
-
-Disable zeroconf explicitely, unless enabled - the distribution
-appears not to allow for this.
-
-We do not at this point support zeroconf via avahi. Since configure
-does not allow for building without avahi, and native avahi is picked
-up on some Linuxen, we disable all avahi tests unconditionally here.
+$NetBSD: patch-configure,v 1.4 2023/01/10 22:07:33 hauke Exp $
Fix build on SunOS by disabling the isainfo bitness check
---- configure.orig 2013-07-23 09:11:35.000000000 +0000
+--- configure.orig 2023-01-10 08:57:35.000000000 +0000
+++ configure
-@@ -16109,7 +16109,7 @@ fi
- if test "${enable_zeroconf+set}" = set; then :
- enableval=$enable_zeroconf; zeroconf=$enableval
- else
-- zeroconf=try
-+ zeroconf=no
-
- fi
-
-@@ -16185,7 +16185,8 @@ $as_echo "#define HAVE_MDNS 1" >>confdef
- fi
-
- # mDNS support using Avahi
-- if test x"$found_zeroconf" != x"yes" ; then
-+ #if test x"$found_zeroconf" != x"yes" ; then
-+ if 0 ; then
- ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default"
- if test "x$ac_cv_header_avahi_client_client_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
-@@ -17535,7 +17536,7 @@ $as_echo_n "checking if we have to build
+@@ -19331,7 +19331,7 @@ printf %s "checking if we have to build
# check for isainfo, if not found it has to be a 32 bit kernel (<=2.6)
if test -x /usr/bin/isainfo; then
# check for 64 bit platform
Home |
Main Index |
Thread Index |
Old Index