mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
(cherry picked from commit 5d8d4fbbcb)
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
committed by
Jeffery To
parent
99a5a094eb
commit
b1cbd93bcd
@@ -1,6 +1,6 @@
|
||||
--- a/Makefile 2017-11-13 01:13:36.340236114 +0200
|
||||
+++ b/Makefile 2017-11-13 01:34:56.869682313 +0200
|
||||
@@ -638,10 +638,6 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -638,10 +638,6 @@ ip6:
|
||||
@echo + yourself, try adding IP6=4 to the make command line.
|
||||
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
@echo
|
||||
@@ -11,7 +11,7 @@
|
||||
@$(TOUCH) ip6
|
||||
|
||||
noip6:
|
||||
@@ -678,20 +674,18 @@
|
||||
@@ -678,20 +674,18 @@ an ua:
|
||||
$(TOOLS)/$@ "$(LN)" src/tmail tmail
|
||||
$(LN) $(TOOLS)/$@ .
|
||||
|
||||
@@ -34,9 +34,9 @@
|
||||
$(TOUCH) rebuild
|
||||
|
||||
rebuild:
|
||||
--- a/src/osdep/unix/Makefile 2017-11-13 01:37:58.674011768 +0200
|
||||
+++ b/src/osdep/unix/Makefile 2017-11-13 03:30:18.204908962 +0200
|
||||
@@ -96,11 +96,11 @@
|
||||
--- a/src/osdep/unix/Makefile
|
||||
+++ b/src/osdep/unix/Makefile
|
||||
@@ -96,11 +96,11 @@ CHECKPW=std
|
||||
LOGINPW=std
|
||||
SIGTYPE=bsd
|
||||
CRXTYPE=std
|
||||
@@ -51,7 +51,7 @@
|
||||
MD5PWD=/etc/cram-md5.pwd
|
||||
# Tries one of the test alternatives below if not specified.
|
||||
LOCKPGM=
|
||||
@@ -154,7 +154,7 @@
|
||||
@@ -154,7 +154,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o
|
||||
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
|
||||
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
|
||||
unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
CAT=cat
|
||||
MAKE=make
|
||||
@@ -162,6 +162,16 @@
|
||||
@@ -162,6 +162,16 @@ MV=mv
|
||||
RM=rm -rf
|
||||
SH=sh
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
|
||||
# Primary build command
|
||||
|
||||
@@ -174,7 +184,7 @@
|
||||
@@ -174,7 +184,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
|
||||
# Here if no make argument established
|
||||
|
||||
missing: osdep.h
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
osdep.h:
|
||||
@echo You must specify what type of system
|
||||
@@ -674,7 +684,7 @@
|
||||
@@ -674,7 +684,7 @@ slx: # Secure Linux
|
||||
@echo You are building for libc6/glibc versions of Secure Linux
|
||||
@echo If you want libc5 versions you must use sl5 instead!
|
||||
@echo If you want libc4 versions you must use sl4 instead!
|
||||
@@ -95,7 +95,7 @@
|
||||
SIGTYPE=psx CHECKPW=psx CRXTYPE=nfs \
|
||||
SPOOLDIR=/var/spool \
|
||||
ACTIVEFILE=/var/lib/news/active \
|
||||
@@ -863,7 +873,7 @@
|
||||
@@ -863,7 +873,7 @@ $(ARCHIVE): $(BINARIES)
|
||||
@$(SH) ARCHIVE
|
||||
|
||||
.c.o:
|
||||
@@ -104,7 +104,7 @@
|
||||
|
||||
|
||||
# Cleanup
|
||||
@@ -922,8 +932,8 @@
|
||||
@@ -922,8 +932,8 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
|
||||
@echo If you get No such file error messages for files x509.h, ssl.h,
|
||||
@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
|
||||
@echo is not installed on your system. Either install OpenSSL first
|
||||
@@ -115,7 +115,7 @@
|
||||
|
||||
osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
|
||||
$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
|
||||
@@ -962,21 +972,14 @@
|
||||
@@ -962,21 +972,14 @@ os_sol.h:
|
||||
|
||||
# Once-only environment setup
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
echo $(OS) > OSTYPE
|
||||
./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
|
||||
./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
|
||||
@@ -1055,7 +1058,6 @@
|
||||
@@ -1055,7 +1058,6 @@ sslsco: sbasic sldsco
|
||||
sbasic: # UNIX OpenSSL
|
||||
@echo Building with SSL
|
||||
$(LN) ssl_unix.c osdepssl.c
|
||||
@@ -149,7 +149,7 @@
|
||||
echo " ssl_onceonlyinit ();" >> linkage.c
|
||||
|
||||
snopwd: # Plaintext disable
|
||||
@@ -1063,13 +1065,12 @@
|
||||
@@ -1063,13 +1065,12 @@ snopwd: # Plaintext disable
|
||||
echo " mail_parameters (NIL,SET_DISABLEPLAINTEXT,(void *) 2);" >> linkage.c
|
||||
|
||||
sldunix:# Normal UNIX SSL load flags
|
||||
|
||||
@@ -3,9 +3,9 @@ paths to imapd, ipop2d and ipop3d in the man pages.
|
||||
|
||||
This patch is based on Red Hat Bugzilla ID #127271 and solves ID #229781.
|
||||
|
||||
--- imap-2004a/src/imapd/imapd.8 2004-05-18 19:46:54.000000000 +0200
|
||||
+++ imap-2004a/src/imapd/imapd.8.doc 2004-07-23 15:24:17.000000000 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
--- a/src/imapd/imapd.8
|
||||
+++ b/src/imapd/imapd.8
|
||||
@@ -16,7 +16,7 @@
|
||||
.SH NAME
|
||||
IMAPd \- Internet Message Access Protocol server
|
||||
.SH SYNOPSIS
|
||||
@@ -14,9 +14,9 @@ This patch is based on Red Hat Bugzilla ID #127271 and solves ID #229781.
|
||||
.SH DESCRIPTION
|
||||
.I imapd
|
||||
is a server which supports the
|
||||
--- imap-2004a/src/ipopd/ipopd.8 2004-05-18 19:50:05.000000000 +0200
|
||||
+++ imap-2004a/src/ipopd/ipopd.8.doc 2004-07-23 15:23:38.000000000 +0200
|
||||
@@ -3,9 +3,9 @@
|
||||
--- a/src/ipopd/ipopd.8
|
||||
+++ b/src/ipopd/ipopd.8
|
||||
@@ -16,9 +16,9 @@
|
||||
.SH NAME
|
||||
IPOPd \- Post Office Protocol server
|
||||
.SH SYNOPSIS
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
diff -up imap-2007e/src/c-client/rfc822.c.overflow imap-2007e/src/c-client/rfc822.c
|
||||
--- imap-2007e/src/c-client/rfc822.c.overflow 2008-12-12 11:08:26.000000000 -0600
|
||||
+++ imap-2007e/src/c-client/rfc822.c 2009-07-07 19:27:20.057772757 -0500
|
||||
--- a/src/c-client/rfc822.c
|
||||
+++ b/src/c-client/rfc822.c
|
||||
@@ -384,6 +384,9 @@ void rfc822_parse_content (BODY *body,ST
|
||||
if (CHR (bs) == '\012'){/* following LF? */
|
||||
c = SNX (bs); i--; /* yes, slurp it */
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
diff -up imap-2007e/src/c-client/auth_md5.c.authmd5 imap-2007e/src/c-client/auth_md5.c
|
||||
--- imap-2007e/src/c-client/auth_md5.c.authmd5 2008-06-04 13:18:34.000000000 -0500
|
||||
+++ imap-2007e/src/c-client/auth_md5.c 2009-07-07 19:24:12.348005485 -0500
|
||||
--- a/src/c-client/auth_md5.c
|
||||
+++ b/src/c-client/auth_md5.c
|
||||
@@ -42,17 +42,17 @@ typedef struct {
|
||||
|
||||
/* Prototypes */
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
diff -Naur imap-2007f.orig/src/osdep/unix/flocklnx.c imap-2007f/src/osdep/unix/flocklnx.c
|
||||
--- imap-2007f.orig/src/osdep/unix/flocklnx.c 2011-07-23 02:20:11.000000000 +0200
|
||||
+++ imap-2007f/src/osdep/unix/flocklnx.c 2014-04-14 19:17:46.429000000 +0200
|
||||
@@ -57,7 +57,7 @@
|
||||
--- a/src/osdep/unix/flocklnx.c
|
||||
+++ b/src/osdep/unix/flocklnx.c
|
||||
@@ -57,7 +57,7 @@ int safe_flock (int fd,int op)
|
||||
case ENOLCK: /* lock table is full */
|
||||
sprintf (tmp,"File locking failure: %s",strerror (errno));
|
||||
mm_log (tmp,WARN); /* give the user a warning of what happened */
|
||||
|
||||
@@ -4,8 +4,6 @@ Description: Use poll(2) instead of select(2) to support more than 1024 file des
|
||||
Author: Ben Smithurst <ben.smithurst@gradwell.com>
|
||||
Bug-Debian: https://bugs.debian.org/478193
|
||||
|
||||
diff --git a/src/osdep/unix/os_lnx.c b/src/osdep/unix/os_lnx.c
|
||||
index 03fd17d..671bbd6 100644
|
||||
--- a/src/osdep/unix/os_lnx.c
|
||||
+++ b/src/osdep/unix/os_lnx.c
|
||||
@@ -41,6 +41,7 @@
|
||||
@@ -16,8 +14,6 @@ index 03fd17d..671bbd6 100644
|
||||
|
||||
|
||||
#include "fs_unix.c"
|
||||
diff --git a/src/osdep/unix/os_slx.c b/src/osdep/unix/os_slx.c
|
||||
index c94d632..f6bf27d 100644
|
||||
--- a/src/osdep/unix/os_slx.c
|
||||
+++ b/src/osdep/unix/os_slx.c
|
||||
@@ -42,6 +42,7 @@ extern int errno; /* just in case */
|
||||
@@ -28,11 +24,9 @@ index c94d632..f6bf27d 100644
|
||||
|
||||
|
||||
#include "fs_unix.c"
|
||||
diff --git a/src/osdep/unix/tcp_unix.c b/src/osdep/unix/tcp_unix.c
|
||||
index 795fb4f..c69eaec 100644
|
||||
--- a/src/osdep/unix/tcp_unix.c
|
||||
+++ b/src/osdep/unix/tcp_unix.c
|
||||
@@ -235,12 +235,11 @@ TCPSTREAM *tcp_open (char *host,char *service,unsigned long port)
|
||||
@@ -235,12 +235,11 @@ TCPSTREAM *tcp_open (char *host,char *se
|
||||
int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port,
|
||||
char *tmp,int *ctr,char *hst)
|
||||
{
|
||||
@@ -47,7 +41,7 @@ index 795fb4f..c69eaec 100644
|
||||
struct sockaddr *sadr = ip_sockaddr (family,adr,adrlen,port,&len);
|
||||
blocknotify_t bn = (blocknotify_t) mail_parameters (NIL,GET_BLOCKNOTIFY,NIL);
|
||||
/* fetid Solaris */
|
||||
@@ -252,14 +251,6 @@ int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port,
|
||||
@@ -252,14 +251,6 @@ int tcp_socket_open (int family,void *ad
|
||||
sprintf (tmp,"Unable to create TCP socket: %s",strerror (errno));
|
||||
(*bn) (BLOCK_NONSENSITIVE,data);
|
||||
}
|
||||
@@ -62,7 +56,7 @@ index 795fb4f..c69eaec 100644
|
||||
|
||||
else { /* get current socket flags */
|
||||
flgs = fcntl (sock,F_GETFL,0);
|
||||
@@ -284,16 +275,11 @@ int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port,
|
||||
@@ -284,16 +275,11 @@ int tcp_socket_open (int family,void *ad
|
||||
if ((sock >= 0) && ctr) { /* want open timeout? */
|
||||
now = time (0); /* open timeout */
|
||||
ti = ttmo_open ? now + ttmo_open : 0;
|
||||
@@ -83,7 +77,7 @@ index 795fb4f..c69eaec 100644
|
||||
now = time (0); /* fake timeout if interrupt & time expired */
|
||||
if ((i < 0) && (errno == EINTR) && ti && (ti <= now)) i = 0;
|
||||
} while ((i < 0) && (errno == EINTR));
|
||||
@@ -302,7 +288,7 @@ int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port,
|
||||
@@ -302,7 +288,7 @@ int tcp_socket_open (int family,void *ad
|
||||
fcntl (sock,F_SETFL,flgs);
|
||||
/* This used to be a zero-byte read(), but that crashes Solaris */
|
||||
/* get socket status */
|
||||
@@ -92,7 +86,7 @@ index 795fb4f..c69eaec 100644
|
||||
}
|
||||
if (i <= 0) { /* timeout or error? */
|
||||
i = i ? errno : ETIMEDOUT;/* determine error code */
|
||||
@@ -545,9 +531,8 @@ long tcp_getbuffer (TCPSTREAM *stream,unsigned long size,char *s)
|
||||
@@ -545,9 +531,8 @@ long tcp_getbuffer (TCPSTREAM *stream,un
|
||||
stream->ictr -=n;
|
||||
}
|
||||
if (size) {
|
||||
@@ -104,7 +98,7 @@ index 795fb4f..c69eaec 100644
|
||||
time_t t = time (0);
|
||||
blocknotify_t bn=(blocknotify_t) mail_parameters (NIL,GET_BLOCKNOTIFY,NIL);
|
||||
(*bn) (BLOCK_TCPREAD,NIL);
|
||||
@@ -556,16 +541,13 @@ long tcp_getbuffer (TCPSTREAM *stream,unsigned long size,char *s)
|
||||
@@ -556,16 +541,13 @@ long tcp_getbuffer (TCPSTREAM *stream,un
|
||||
time_t now = tl;
|
||||
time_t ti = ttmo_read ? now + ttmo_read : 0;
|
||||
if (tcpdebug) mm_log ("Reading TCP buffer",TCPDEBUG);
|
||||
@@ -126,7 +120,7 @@ index 795fb4f..c69eaec 100644
|
||||
now = time (0); /* fake timeout if interrupt & time expired */
|
||||
if ((i < 0) && (errno == EINTR) && ti && (ti <= now)) i = 0;
|
||||
} while ((i < 0) && (errno == EINTR));
|
||||
@@ -605,9 +587,8 @@ long tcp_getbuffer (TCPSTREAM *stream,unsigned long size,char *s)
|
||||
@@ -605,9 +587,8 @@ long tcp_getbuffer (TCPSTREAM *stream,un
|
||||
|
||||
long tcp_getdata (TCPSTREAM *stream)
|
||||
{
|
||||
@@ -158,7 +152,7 @@ index 795fb4f..c69eaec 100644
|
||||
now = time (0); /* fake timeout if interrupt & time expired */
|
||||
if ((i < 0) && (errno == EINTR) && ti && (ti <= now)) i = 0;
|
||||
} while ((i < 0) && (errno == EINTR));
|
||||
@@ -677,9 +655,8 @@ long tcp_soutr (TCPSTREAM *stream,char *string)
|
||||
@@ -677,9 +655,8 @@ long tcp_soutr (TCPSTREAM *stream,char *
|
||||
|
||||
long tcp_sout (TCPSTREAM *stream,char *string,unsigned long size)
|
||||
{
|
||||
@@ -170,7 +164,7 @@ index 795fb4f..c69eaec 100644
|
||||
time_t t = time (0);
|
||||
blocknotify_t bn = (blocknotify_t) mail_parameters (NIL,GET_BLOCKNOTIFY,NIL);
|
||||
if (stream->tcpso < 0) return NIL;
|
||||
@@ -689,15 +666,12 @@ long tcp_sout (TCPSTREAM *stream,char *string,unsigned long size)
|
||||
@@ -689,15 +666,12 @@ long tcp_sout (TCPSTREAM *stream,char *s
|
||||
time_t now = tl;
|
||||
time_t ti = ttmo_write ? now + ttmo_write : 0;
|
||||
if (tcpdebug) mm_log ("Writing to TCP",TCPDEBUG);
|
||||
|
||||
@@ -12,8 +12,6 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
||||
src/osdep/unix/ssl_unix.c | 28 +++++++++++++++++-----------
|
||||
1 file changed, 17 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c
|
||||
index 3bfdff3..836e9fa 100644
|
||||
--- a/src/osdep/unix/ssl_unix.c
|
||||
+++ b/src/osdep/unix/ssl_unix.c
|
||||
@@ -59,7 +59,7 @@ typedef struct ssl_stream {
|
||||
@@ -25,7 +23,7 @@ index 3bfdff3..836e9fa 100644
|
||||
static long ssl_compare_hostnames (unsigned char *s,unsigned char *pat);
|
||||
static char *ssl_getline_work (SSLSTREAM *stream,unsigned long *size,
|
||||
long *contd);
|
||||
@@ -210,6 +210,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags)
|
||||
@@ -210,6 +210,7 @@ static char *ssl_start_work (SSLSTREAM *
|
||||
BIO *bio;
|
||||
X509 *cert;
|
||||
unsigned long sl,tl;
|
||||
@@ -33,7 +31,7 @@ index 3bfdff3..836e9fa 100644
|
||||
char *s,*t,*err,tmp[MAILTMPLEN];
|
||||
sslcertificatequery_t scq =
|
||||
(sslcertificatequery_t) mail_parameters (NIL,GET_SSLCERTIFICATEQUERY,NIL);
|
||||
@@ -266,14 +267,19 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags)
|
||||
@@ -266,14 +267,19 @@ static char *ssl_start_work (SSLSTREAM *
|
||||
if (SSL_write (stream->con,"",0) < 0)
|
||||
return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
|
||||
/* need to validate host names? */
|
||||
@@ -60,7 +58,7 @@ index 3bfdff3..836e9fa 100644
|
||||
}
|
||||
return NIL;
|
||||
}
|
||||
@@ -313,7 +319,7 @@ static int ssl_open_verify (int ok,X509_STORE_CTX *ctx)
|
||||
@@ -313,7 +319,7 @@ static int ssl_open_verify (int ok,X509_
|
||||
* Returns: NIL if validated, else string of error message
|
||||
*/
|
||||
|
||||
@@ -69,7 +67,7 @@ index 3bfdff3..836e9fa 100644
|
||||
{
|
||||
int i,n;
|
||||
char *s,*t,*ret;
|
||||
@@ -322,9 +328,9 @@ static char *ssl_validate_cert (X509 *cert,char *host)
|
||||
@@ -322,9 +328,9 @@ static char *ssl_validate_cert (X509 *ce
|
||||
/* make sure have a certificate */
|
||||
if (!cert) ret = "No certificate from server";
|
||||
/* and that it has a name */
|
||||
@@ -81,6 +79,3 @@ index 3bfdff3..836e9fa 100644
|
||||
if (t = strchr (s += 4,'/')) *t = '\0';
|
||||
/* host name matches pattern? */
|
||||
ret = ssl_compare_hostnames (host,s) ? NIL :
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
diff --git a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c
|
||||
index 3bfdff3..3ed1cb5 100644
|
||||
--- a/src/osdep/unix/ssl_unix.c
|
||||
+++ b/src/osdep/unix/ssl_unix.c
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
Reference in New Issue
Block a user