summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authornat <nat@pkgsrc.org>2022-01-28 21:18:18 +0000
committernat <nat@pkgsrc.org>2022-01-28 21:18:18 +0000
commitf36e980a1d5845c11a31e363756c85d8715b4eb4 (patch)
tree2ec14e253d00f149b48fa48b195d7d549ac6f95f /net
parenta7d7a444d575042569e61f6f0cc65463ecb34ca4 (diff)
downloadpkgsrc-f36e980a1d5845c11a31e363756c85d8715b4eb4.tar.gz
Backgrond printing works again:
https://github.com/rdmark/Netatalk/pull/1/commits/1d289cc41e810748237e2 6518d8f9b57954f5875 Allow a session tickleval of 0 instead of -1. Based on the following commit: https://github.com/rdmark/Netatalk/commit/0b4e290ac5343df093cbaef9c5ebcbc11ee - 912a2#diff-ac91c62802b4ac4bd19ade9f9b2ed99e07560281f11655038ee85b6f628cb1c1 These patches were supplied by Daniel Markstedt (rdmark) from his fork of Netatalk22.
Diffstat (limited to 'net')
-rw-r--r--net/netatalk22/Makefile4
-rw-r--r--net/netatalk22/distinfo12
-rw-r--r--net/netatalk22/patches/patch-config_afpd.conf.tmpl4
-rw-r--r--net/netatalk22/patches/patch-etc_afpd_afp__options.c4
-rw-r--r--net/netatalk22/patches/patch-etc_papd_magics.c10
-rw-r--r--net/netatalk22/patches/patch-libatalk_asp_asp__getsess.c4
-rw-r--r--net/netatalk22/patches/patch-man_man5_afpd.conf.5.tmpl4
7 files changed, 17 insertions, 25 deletions
diff --git a/net/netatalk22/Makefile b/net/netatalk22/Makefile
index 9f7ee2540e7..89e62a1b965 100644
--- a/net/netatalk22/Makefile
+++ b/net/netatalk22/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2021/12/08 16:06:04 adam Exp $
+# $NetBSD: Makefile,v 1.45 2022/01/28 21:18:18 nat Exp $
DISTNAME= netatalk-2.2.6
PKGNAME= ${DISTNAME:C/-/22-/}
-PKGREVISION= 29
+PKGREVISION= 30
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/netatalk22/distinfo b/net/netatalk22/distinfo
index ec05ec26c16..950af630859 100644
--- a/net/netatalk22/distinfo
+++ b/net/netatalk22/distinfo
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:06:06 nia Exp $
+$NetBSD: distinfo,v 1.13 2022/01/28 21:18:18 nat 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) = 0640c91319d06745664dfe048f7b13d5eeb89d6f
+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) = 4e21b9701e64aa47cbb707047988be609acfb1cf
+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) = e1d0a871de6cb567e9d98fa428aa560f6203c89c
+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) = 398cf1b4cadecb96a0a25a50255a5516ba62a0d7
+SHA1 (patch-libatalk_asp_asp__getsess.c) = 0ae089ef4f882a1580298707fbeee5d519c83482
SHA1 (patch-libatalk_bstring_bstrlib.c) = f43818328237b908166f956de464f532d578d2c4
-SHA1 (patch-man_man5_afpd.conf.5.tmpl) = 33597b5f1bb98c17f9a94d2d33549541690aedfd
+SHA1 (patch-man_man5_afpd.conf.5.tmpl) = 43dfb930851329e5fe77d2fae4b8b7237a3fe42c
diff --git a/net/netatalk22/patches/patch-config_afpd.conf.tmpl b/net/netatalk22/patches/patch-config_afpd.conf.tmpl
index d33a75fa8f9..39f769b42a6 100644
--- a/net/netatalk22/patches/patch-config_afpd.conf.tmpl
+++ b/net/netatalk22/patches/patch-config_afpd.conf.tmpl
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_afpd.conf.tmpl,v 1.1 2021/09/12 15:52:37 nat Exp $
+$NetBSD: patch-config_afpd.conf.tmpl,v 1.2 2022/01/28 21:18:19 nat Exp $
Allow -1 as a vaild tickleval to disable session tickles.
As needed on appletalk 58.
@@ -9,7 +9,7 @@ As needed on appletalk 58.
# Note, this defaults to 30 seconds, and really
# shouldn't be changed. If you want to control
# the server idle timeout, use the -timeout option.
-+# A value of -1 disables session timer tickles.
++# A value of 0 disables session timer tickles.
# -timeout <number> Specify the number of tickles to send before
# timing out a connection.
# The default is 4, therefore a connection will
diff --git a/net/netatalk22/patches/patch-etc_afpd_afp__options.c b/net/netatalk22/patches/patch-etc_afpd_afp__options.c
index eff382c0bdc..443c7e7629f 100644
--- a/net/netatalk22/patches/patch-etc_afpd_afp__options.c
+++ b/net/netatalk22/patches/patch-etc_afpd_afp__options.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-etc_afpd_afp__options.c,v 1.1 2021/09/12 15:52:37 nat Exp $
+$NetBSD: patch-etc_afpd_afp__options.c,v 1.2 2022/01/28 21:18:19 nat Exp $
Allow -1 as a vaild tickleval to disable session tickles.
As needed on appletalk 58.
@@ -10,7 +10,7 @@ As needed on appletalk 58.
if ((c = getoption(buf, "-tickleval"))) {
options->tickleval = atoi(c);
- if (options->tickleval <= 0) {
-+ if (options->tickleval != -1 && options->tickleval <= 0) {
++ if (options->tickleval < 0) {
options->tickleval = 30;
}
}
diff --git a/net/netatalk22/patches/patch-etc_papd_magics.c b/net/netatalk22/patches/patch-etc_papd_magics.c
index 8a8d7d34cba..063125b3c22 100644
--- a/net/netatalk22/patches/patch-etc_papd_magics.c
+++ b/net/netatalk22/patches/patch-etc_papd_magics.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-etc_papd_magics.c,v 1.1 2021/09/12 15:52:37 nat Exp $
+$NetBSD: patch-etc_papd_magics.c,v 1.2 2022/01/28 21:18:19 nat Exp $
Send a reply when more data required by papd server.
As required by appletalk 58.
@@ -33,11 +33,3 @@ AFAICT this should have no consequence on later appletalk versions.
return( CH_MORE );
case -2 :
-@@ -149,6 +152,7 @@ int cm_psadobe( struct papfile *in, stru
- return( CH_DONE );
-
- case -1 :
-+ spoolreply( out, "Processing..." );
- return( CH_MORE );
-
- case -2 :
diff --git a/net/netatalk22/patches/patch-libatalk_asp_asp__getsess.c b/net/netatalk22/patches/patch-libatalk_asp_asp__getsess.c
index 9e5d8764121..6a29f950a3d 100644
--- a/net/netatalk22/patches/patch-libatalk_asp_asp__getsess.c
+++ b/net/netatalk22/patches/patch-libatalk_asp_asp__getsess.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-libatalk_asp_asp__getsess.c,v 1.1 2021/09/12 15:52:37 nat Exp $
+$NetBSD: patch-libatalk_asp_asp__getsess.c,v 1.2 2022/01/28 21:18:19 nat Exp $
Allow -1 as a vaild tickleval to disable session tickles.
As needed on appletalk 58.
@@ -11,7 +11,7 @@ As needed on appletalk 58.
timer.it_interval.tv_usec = timer.it_value.tv_usec = 0;
- if ((sigaction(SIGALRM, &action, NULL) < 0) ||
- (setitimer(ITIMER_REAL, &timer, NULL) < 0)) {
-+ if (tickleval != -1 && ((sigaction(SIGALRM, &action, NULL) < 0) ||
++ if (tickleval && ((sigaction(SIGALRM, &action, NULL) < 0) ||
+ (setitimer(ITIMER_REAL, &timer, NULL) < 0))) {
free(asp_ac);
server_asp = NULL;
diff --git a/net/netatalk22/patches/patch-man_man5_afpd.conf.5.tmpl b/net/netatalk22/patches/patch-man_man5_afpd.conf.5.tmpl
index c14c2166e3b..41d33c60f59 100644
--- a/net/netatalk22/patches/patch-man_man5_afpd.conf.5.tmpl
+++ b/net/netatalk22/patches/patch-man_man5_afpd.conf.5.tmpl
@@ -1,4 +1,4 @@
-$NetBSD: patch-man_man5_afpd.conf.5.tmpl,v 1.1 2021/09/12 15:52:37 nat Exp $
+$NetBSD: patch-man_man5_afpd.conf.5.tmpl,v 1.2 2022/01/28 21:18:19 nat Exp $
Allow -1 as a vaild tickleval to disable session tickles.
As needed on appletalk 58.
@@ -9,7 +9,7 @@ As needed on appletalk 58.
\-tickleval \fI[number]\fR
.RS 4
Sets the tickle timeout interval (in seconds)\&. Defaults to 30\&.
-+A value of -1 disables session tickles.
++A value of 0 disables session tickles.
.RE
.PP
\-timeout \fI[number]\fR