Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12564/10.3/unstable/main/finkinfo/base
Modified Files:
apt.info apt.patch
Log Message:
OS X 10.3 defines socklen_t so only patch for 10.2 (in PatchScript to
avoid accidental regression).
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/apt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apt.patch 30 Sep 2004 22:32:06 -0000 1.4
+++ apt.patch 1 Oct 2004 19:23:27 -0000 1.5
@@ -781,41 +781,6 @@
if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
return _error->Errno("getsockopt","Failed");
if (Err != 0)
-@@ -739,7 +739,7 @@
-
- // Determine the name to send to the remote
- struct sockaddr_storage Addr;
-- socklen_t AddrLen = sizeof(Addr);
-+ int AddrLen = sizeof(Addr);
- if (getsockname(DataListenFd,(sockaddr *)&Addr,&AddrLen) < 0)
- return _error->Errno("getsockname","Could not determine the socket's name");
-
-@@ -815,7 +815,7 @@
-
- // Accept the connection
- struct sockaddr_in Addr;
-- socklen_t Len = sizeof(Addr);
-+ int Len = sizeof(Addr);
- DataFd = accept(DataListenFd,(struct sockaddr *)&Addr,&Len);
- if (DataFd < 0)
- return _error->Errno("accept","Unable to accept connection");
-diff -ruN apt-0.5.4/methods/ftp.h apt-0.5.4-patched/methods/ftp.h
---- apt-0.5.4/methods/ftp.h Tue Mar 6 02:15:29 2001
-+++ apt-0.5.4-patched/methods/ftp.h Sun Nov 9 14:02:48 2003
-@@ -26,11 +26,11 @@
-
- // Generic Peer Address
- struct sockaddr_storage PeerAddr;
-- socklen_t PeerAddrLen;
-+ int PeerAddrLen;
-
- // Generic Server Address (us)
- struct sockaddr_storage ServerAddr;
-- socklen_t ServerAddrLen;
-+ int ServerAddrLen;
-
- // Private helper functions
- bool ReadLine(string &Text);
diff -ruN apt-0.5.4/methods/rfc2553emu.h apt-0.5.4-patched/methods/rfc2553emu.h
--- apt-0.5.4/methods/rfc2553emu.h Sun Jun 18 02:04:45 2000
+++ apt-0.5.4-patched/methods/rfc2553emu.h Sun Nov 9 14:02:48 2003
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/apt.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- apt.info 30 Sep 2004 22:32:06 -0000 1.8
+++ apt.info 1 Oct 2004 19:23:27 -0000 1.9
@@ -12,6 +12,7 @@
sh patch_flush
for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if
defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if
defined(__GNUG__) && !defined(__APPLE_CC__)/' $i ; done
+#perl -pi.bak -e 's/socklen_t/int/' methods/ftp.h methods/ftp.cc
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
@@ -133,6 +134,8 @@
The sources.list file is now supplied by the fink program rather than
by apt-get.
+
+socklen_t exists starting in OS X 10.3
<<
DescPackaging: <<
Previous versions by Christoph Pfisterer.
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
