Defuzzification of ipv6 patch
This commit is contained in:
Jaroslav Škarvada
parent
4f08a89309
commit
97880509a7
@ -1,5 +1,7 @@
|
||||
--- procmail-3.22/src/autoconf.ipv6 2006-10-24 14:46:44.000000000 +0200
|
||||
+++ procmail-3.22/src/autoconf 2006-10-24 14:51:01.000000000 +0200
|
||||
diff --git a/src/autoconf b/src/autoconf
|
||||
index 3a52e6c..ff78048 100755
|
||||
--- a/src/autoconf
|
||||
+++ b/src/autoconf
|
||||
@@ -68,8 +68,6 @@
|
||||
# #define NOfsync
|
||||
#Ok #define endpwent()
|
||||
@ -9,7 +11,7 @@
|
||||
#Ok #define endprotoent()
|
||||
# #define h_0addr_list h_addr
|
||||
#Ok #define NOpw_passwd
|
||||
@@ -896,7 +894,7 @@
|
||||
@@ -896,7 +894,7 @@ int main(){int i=0;
|
||||
{uid_t vuid_t;i+=vuid_t=1;}
|
||||
{gid_t vgid_t;i+=vgid_t=1;}
|
||||
#ifndef NO_COMSAT
|
||||
@ -18,7 +20,7 @@
|
||||
#endif
|
||||
#ifndef NOuname
|
||||
{struct utsname vutsname;i+=!(*vutsname.nodename='\0');}
|
||||
@@ -917,8 +915,6 @@
|
||||
@@ -917,8 +915,6 @@ do
|
||||
test -z "$i3" && grepfor mode_t 'typedef int mode_t;' && i3=I
|
||||
test -z "$i4" && grepfor uid_t 'typedef int uid_t;' && i4=I
|
||||
test -z "$i5" && grepfor gid_t 'typedef int gid_t;' && i5=I
|
||||
@ -27,7 +29,7 @@
|
||||
test -z "$i6" && grepfor member '#define h_0addr_list h_addr' && i6=I
|
||||
test -z "$i7" && grepfor utsname "#define NOuname \
|
||||
/* <sys/utsname.h> is there, but empty */" && i7=I
|
||||
@@ -1048,8 +1044,12 @@
|
||||
@@ -1048,8 +1044,12 @@ int main(){char a[2];
|
||||
{struct utsname b;uname(&b);}
|
||||
#endif
|
||||
#ifndef NO_COMSAT
|
||||
@ -42,7 +44,7 @@
|
||||
#endif
|
||||
_exit(0);
|
||||
return 0;}
|
||||
@@ -1103,14 +1103,9 @@
|
||||
@@ -1103,14 +1103,9 @@ grepfor uname "\
|
||||
/* <sys/utsname.h> defines it, the libraries don't */"
|
||||
grepfor endpwent '#define endpwent()'
|
||||
grepfor endgrent '#define endgrent()'
|
||||
@ -58,7 +60,7 @@
|
||||
fi
|
||||
grepfor strstr '#define SLOWstrstr' ||
|
||||
grepfor clock '#define SLOWstrstr'
|
||||
@@ -1239,39 +1234,9 @@
|
||||
@@ -1239,39 +1234,9 @@ int main(argc,argv)int argc;const char*argv[];
|
||||
printf("/* Insufficient memory to perform the benchmark! */\n");
|
||||
#endif /* SLOWstrstr */
|
||||
#ifndef NO_COMSAT
|
||||
@ -100,33 +102,11 @@
|
||||
#endif /* NO_COMSAT */
|
||||
;{ unsigned long s=(size_t)~0;int bits;
|
||||
for(bits=1;s>>=1;bits++);
|
||||
--- procmail-3.22/src/network.h.ipv6 1999-04-17 08:18:45.000000000 +0200
|
||||
+++ procmail-3.22/src/network.h 2006-10-24 14:46:44.000000000 +0200
|
||||
@@ -1,19 +1,13 @@
|
||||
/*$Id: procmail-3.22-ipv6.patch,v 1.1 2006/10/27 13:33:50 mlichvar Exp $*/
|
||||
|
||||
-#include <sys/socket.h> /* socket() sendto() AF_INET
|
||||
+#include <sys/socket.h> /* socket() sendto() */
|
||||
/* SOCK_DGRAM */
|
||||
-#include <netdb.h> /* gethostbyname() getservbyname()
|
||||
- /* getprotobyname() */
|
||||
-#include <netinet/in.h> /* htons() struct sockaddr_in */
|
||||
+#include <netdb.h> /* getaddrinfo() */
|
||||
|
||||
#ifndef BIFF_serviceport
|
||||
#define BIFF_serviceport COMSATservice
|
||||
#endif
|
||||
|
||||
-#ifndef h_0addr_list
|
||||
-#define h_0addr_list h_addr_list[0] /* POSIX struct member */
|
||||
-#endif
|
||||
-
|
||||
#ifndef NO_const /* since network.h is outside the autoconf const check */
|
||||
#ifdef const /* loop, we need this backcheck for some systems */
|
||||
#undef const
|
||||
--- procmail-3.22/src/comsat.c.ipv6 2006-10-24 14:46:44.000000000 +0200
|
||||
+++ procmail-3.22/src/comsat.c 2006-10-24 14:46:44.000000000 +0200
|
||||
@@ -27,7 +27,8 @@
|
||||
diff --git a/src/comsat.c b/src/comsat.c
|
||||
index 9712e74..5082b16 100644
|
||||
--- a/src/comsat.c
|
||||
+++ b/src/comsat.c
|
||||
@@ -27,7 +27,8 @@ static /*const*/char rcsid[]=
|
||||
#include "comsat.h"
|
||||
|
||||
static int csvalid; /* is it turned on with a good address? */
|
||||
@ -136,7 +116,7 @@
|
||||
static char*cslastf,*cslgname;
|
||||
|
||||
void setlfcs(folder)const char*folder; /* set lastfolder for comsat */
|
||||
@@ -62,56 +63,32 @@
|
||||
@@ -62,56 +63,32 @@ void setlgcs(name)const char*name; /* set logname for comsat */
|
||||
}
|
||||
|
||||
int setcomsat(chp)const char*chp;
|
||||
@ -209,7 +189,7 @@
|
||||
offguard();
|
||||
return newvalid;
|
||||
}
|
||||
@@ -132,8 +109,8 @@
|
||||
@@ -132,8 +109,8 @@ void sendcomsat(folder)const char*folder;
|
||||
}
|
||||
strlcat(buf,COMSATxtrsep,linebuf); /* custom seperator */
|
||||
strlcat(buf,p,linebuf); /* where was it delivered? */
|
||||
@ -220,3 +200,29 @@
|
||||
rclose(s);
|
||||
yell("Notified comsat:",buf);
|
||||
}
|
||||
diff --git a/src/network.h b/src/network.h
|
||||
index d7d08f2..b09b6c4 100644
|
||||
--- a/src/network.h
|
||||
+++ b/src/network.h
|
||||
@@ -1,19 +1,13 @@
|
||||
/*$Id: network.h,v 1.7 1997/04/02 03:15:41 srb Exp $*/
|
||||
|
||||
-#include <sys/socket.h> /* socket() sendto() AF_INET
|
||||
+#include <sys/socket.h> /* socket() sendto() */
|
||||
/* SOCK_DGRAM */
|
||||
-#include <netdb.h> /* gethostbyname() getservbyname()
|
||||
- /* getprotobyname() */
|
||||
-#include <netinet/in.h> /* htons() struct sockaddr_in */
|
||||
+#include <netdb.h> /* getaddrinfo() */
|
||||
|
||||
#ifndef BIFF_serviceport
|
||||
#define BIFF_serviceport COMSATservice
|
||||
#endif
|
||||
|
||||
-#ifndef h_0addr_list
|
||||
-#define h_0addr_list h_addr_list[0] /* POSIX struct member */
|
||||
-#endif
|
||||
-
|
||||
#ifndef NO_const /* since network.h is outside the autoconf const check */
|
||||
#ifdef const /* loop, we need this backcheck for some systems */
|
||||
#undef const
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Mail processing program
|
||||
Name: procmail
|
||||
Version: 3.22
|
||||
Release: 26%{?dist}
|
||||
Release: 27%{?dist}
|
||||
License: GPLv2+ or Artistic
|
||||
Group: Applications/Internet
|
||||
Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz
|
||||
@ -66,6 +66,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%{_mandir}/man[15]/*
|
||||
|
||||
%changelog
|
||||
* Fri Nov 25 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 3.22-27
|
||||
- Defuzzification of ipv6 patch
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.22-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user