Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv8306/net
Modified Files:
libssh2.info postfix.info
Added Files:
libnet1.0.info libnet1.0.patch libnet1.1.info libnet1.1.patch
libssh2.1.info
Log Message:
Sync with unstable.
Index: libssh2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/net/libssh2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libssh2.info 24 Apr 2007 11:46:38 -0000 1.1
+++ libssh2.info 6 Jul 2007 19:01:24 -0000 1.2
@@ -1,6 +1,6 @@
Package: libssh2
Version: 0.14
-Revision: 1
+Revision: 2
Description: Library implementing the SSH2 protocol
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Homepage: http://www.libssh2.org
@@ -12,7 +12,6 @@
Patched and manually installed to do proper versioning.
Newer versions will use libtool and won't need this hackery.
- Patched libssh2_config.h.in to disable poll and use select.
<<
Source: mirror:sourceforge:libssh2/libssh2-%v.tar.gz
@@ -21,10 +20,11 @@
Depends: %N-shlibs (= %v-%r)
BuildDepends: system-openssl-dev
BuildDependsOnly: true
+Conflicts: libssh2.1
+Replaces: libssh2.1
PatchScript: <<
perl -pi.bak -e's,-flat_namespace,-install_name %p/lib/libssh2.0.dylib
-current_version 1.0.0 -compatibility_version 1.0.0,' configure
- perl -pi.bak -e's,#undef HAVE_POLL,/* $& */,' include/libssh2_config.h.in
<<
NoSetCPPFLAGS: true
--- NEW FILE: libssh2.1.info ---
Package: libssh2.1
Version: 0.15
Revision: 1
Description: Library implementing the SSH2 protocol
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Homepage: http://www.libssh2.org
License: BSD
DescPackaging: <<
The actual name of this library is libssh2; the "2" has
nothing to do with the version number. The major version
number is actually 1.
<<
Source: mirror:sourceforge:libssh2/libssh2-%v.tar.gz
Source-MD5: 6c641d6dc0d0e546249cad1d16f10a6a
Depends: %N-shlibs (= %v-%r)
BuildDepends: system-openssl-dev
BuildDependsOnly: true
Conflicts: libssh2
Replaces: libssh2
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --with-openssl=%p/lib/system-openssl --with-libz=/usr
--disable-dependency-tracking
InstallScript: <<
make install DESTDIR=%d
<<
DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README
SplitOff: <<
Package: %N-shlibs
Files: lib/libssh2.1.0.0.dylib lib/libssh2.1.dylib
Shlibs: %p/lib/libssh2.1.dylib 2.0.0 %n (>= 0.14.99-1)
DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README
<<
InfoTest: <<
TestScript: make check || exit 2
<<
--- NEW FILE: libnet1.0.info ---
Package: libnet1.0
Version: 1.0.2a
Revision: 101
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
#The original source site is gone.
#Source: http://www.packetfactory.net/libnet/dist/deprecated/libnet-%v.tar.gz
Source: http://homepage.mac.com/danielj7/libnet-%v.tar.gz
SourceDirectory: Libnet-%v
Source-MD5: ddf53f0f484184390e8c2a1bd0853667
PatchFile: %n.patch
PatchFile-MD5: 031fdc57c93f169b59b838c6931e092c
Conflicts: libnet1.1, libnet
Replaces: libnet1.1, libnet
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
UpdateConfigGuess: true
BuildDepends: cctools (>= 446-1), fink (>= 0.24.12-1), libtool14
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/etc
install -m 644 libnet-config %i/etc
<<
DocFiles: doc/CHANGELOG doc/COPYING doc/README
Description: Set of routines to handle network packets
DescPackaging: <<
Patched to build correctly on Intel and use libtool in Makefile
to build shared libraries. We use the libtool -release flag
since upstream interface plans are unknown and probably moot
since there doesn't seem to BE an upstream anymore.
I'm not sure why libnet-config is being installed in etc,
but I left it there since something might use it. I did
remove the ConfFiles field since that caused libnet-config
to stick around even after package removal. Yikes!
Previous revisions by Jeremy Higgs <[EMAIL PROTECTED]>.
<<
Homepage: http://www.packetfactory.net/projects/libnet/
License: OSI-Approved
SplitOff: <<
Package: %N-shlibs
Files: lib/libnet-1.0.dylib
Shlibs: %p/lib/libnet-1.0.dylib 0.0.0 %n (>= 1.0.2a-101)
DocFiles: doc/CHANGELOG doc/COPYING doc/README
<<
Index: postfix.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/net/postfix.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- postfix.info 18 Apr 2007 23:31:30 -0000 1.8
+++ postfix.info 6 Jul 2007 19:01:24 -0000 1.9
@@ -1,6 +1,6 @@
Info2: <<
Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]
-Version: 2.3.8
+Version: 2.4.3
Revision: 1
Type: -mysql (boolean), -ldap (boolean)
@@ -105,7 +105,7 @@
Recommends: cyrus-sasl2
Source:
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%v.tar.gz
-Source-MD5: a6c560657788fc7a5444fa9ea32f5513
+Source-MD5: 7d2e126189b91f41fdb1ddb0bd354fd3
PatchFile: %{ni}.patch
PatchFile-MD5: 31684b35b796746b483b36191a250abf
--- NEW FILE: libnet1.1.info ---
Package: libnet1.1
Version: 1.1.2.1
Revision: 3
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
#The original source site is gone
#Source: http://www.packetfactory.net/libnet/dist/libnet-%v.tar.gz
Source: http://homepage.mac.com/danielj7/libnet-%v.tar.gz
SourceDirectory: libnet
Source-MD5: be845c41170d72c7db524f3411b50256
PatchFile: %n.patch
PatchFile-MD5: 36abac8755384d4c470475ac07aaf543
PatchScript: <<
patch -p1 < %{PatchFile}
perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' acinclude.m4
autoreconf -fvi
<<
Conflicts: libnet, libnet1.0
Replaces: libnet, libnet1.0
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
BuildDepends: fink (>= 0.24.12-1), cctools (>= 446-1), autoconf (>= 2.60-1),
automake1.9, libtool14
DocFiles: README doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING
doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED
doc/RAWSOCKET_NON_SEQUITUR doc/TODO
ConfigureParams: --disable-dependency-tracking
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/bin
cp libnet-config %i/bin
chmod 0755 %i/bin/libnet-config
<<
Description: Set of routines to handle network packets
DescPackaging: <<
Version 1.1.2.1 courtesy of [EMAIL PROTECTED]
Patched to build correctly on Intel and use libtool in Makefile
to build shared libraries. We use the libtool -release flag
since upstream interface plans are unknown and probably moot
since there doesn't seem to BE an upstream anymore.
Previous revisions by Jeremy Higgs <[EMAIL PROTECTED]>.
<<
Homepage: http://www.packetfactory.net/projects/libnet/
License: BSD
SplitOff: <<
Package: %N-shlibs
Files: lib/libnet-1.1.dylib
Shlibs: %p/lib/libnet-1.1.dylib 0.0.0 %n (>= 1.1.2.1-3)
DocFiles: README doc/COPYING
<<
--- NEW FILE: libnet1.0.patch ---
diff -ru Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
--- Libnet-1.0.2a.orig/Makefile.in 2001-02-05 12:51:41.000000000 -0500
+++ Libnet-1.0.2a/Makefile.in 2007-01-05 17:53:33.000000000 -0500
@@ -15,12 +15,12 @@
srcdir = @srcdir@
BIN_PREFIX = @bindir@/
INC_PREFIX = @includedir@/
-LIB_PREFIX = @libdir@/
-MAN_PREFIX = @MAN_PREFIX@
+LIB_PREFIX = @libdir@
+MAN_PREFIX = @exec_prefix@/share/man/man3
LIBNET = libnet
LIBPWRITE = libpwrite
-LIB = lib/$(LIBNET).a
+LIB = lib/$(LIBNET).la
MAN = doc/$(LIBNET).3
INCLUDE = include/$(LIBNET).h
INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h
@@ -39,45 +39,44 @@
INSTALL_DATA= $(srcdir)/install-sh
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
-OBJECTS = src/libnet_resolve.o\
- src/libnet_socket.o\
- src/libnet_checksum.o\
- src/libnet_prand.o\
- src/libnet_version.o\
- src/libnet_write_ip.o\
- src/libnet_insert_ipo.o\
- src/libnet_insert_tcpo.o\
- src/libnet_error.o\
- src/[EMAIL PROTECTED]@.o\
- src/libnet_packet_mem.o\
- src/libnet_build_ip.o\
- src/libnet_build_tcp.o\
- src/libnet_build_udp.o\
- src/libnet_build_arp.o\
- src/libnet_build_ethernet.o\
- src/libnet_build_icmp.o\
- src/libnet_build_igmp.o\
- src/libnet_build_dns.o\
- src/libnet_build_snmp.o\
- src/libnet_build_rip.o\
- src/libnet_build_ospf.o\
- src/libnet_build_vrrp.o\
- src/libnet_asn1.o\
- src/libnet_hex_dump.o\
- src/libnet_if_addr.o\
- src/libnet_port_list.o
+OBJECTS = src/libnet_resolve.lo\
+ src/libnet_socket.lo\
+ src/libnet_checksum.lo\
+ src/libnet_prand.lo\
+ src/libnet_version.lo\
+ src/libnet_write_ip.lo\
+ src/libnet_insert_ipo.lo\
+ src/libnet_insert_tcpo.lo\
+ src/libnet_error.lo\
+ src/[EMAIL PROTECTED]@.lo\
+ src/libnet_packet_mem.lo\
+ src/libnet_build_ip.lo\
+ src/libnet_build_tcp.lo\
+ src/libnet_build_udp.lo\
+ src/libnet_build_arp.lo\
+ src/libnet_build_ethernet.lo\
+ src/libnet_build_icmp.lo\
+ src/libnet_build_igmp.lo\
+ src/libnet_build_dns.lo\
+ src/libnet_build_snmp.lo\
+ src/libnet_build_rip.lo\
+ src/libnet_build_ospf.lo\
+ src/libnet_build_vrrp.lo\
+ src/libnet_asn1.lo\
+ src/libnet_hex_dump.lo\
+ src/libnet_if_addr.lo\
+ src/libnet_port_list.lo
-.c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@
+%.lo: %.c
+ glibtool --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o
$@
all: libnet
supp: test example
libnet: version.h $(OBJECTS)
- $(AR) -cr $(LIB) $(OBJECTS)
- $(RANLIB) $(LIB)
+ glibtool --mode=link $(CC) -o $(LIB) $(OBJECTS) -rpath $(LIB_PREFIX)
-release 1.0
-version.o: version.h
+version.lo: version.h
version.h: ./VERSION
@rm -f $@
sed -e 's/.*/#define VERSION "&"/' ./VERSION > $@
@@ -98,9 +97,10 @@
$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
- rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
+ glibtool --mode=install $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
+# rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
+ cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET)-1.0.dylib
$(LIBPWRITE).dylib
$(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
diff -ru Libnet-1.0.2a.orig/configure Libnet-1.0.2a/configure
--- Libnet-1.0.2a.orig/configure 2001-01-17 15:59:33.000000000 -0500
+++ Libnet-1.0.2a/configure 2007-01-05 17:26:49.000000000 -0500
@@ -1652,6 +1652,16 @@
BIN_PREFIX="$prefix/bin/"
;;
+*darwin*)
+ cat >>confdefs.h <<\_ACEOF
+#define LIBNET_BSD_BYTE_SWAP 1
+_ACEOF
+
+ LIBNET_CONFIG_DEFINES="-DLIBNET_BSD_BYTE_SWAP"
+ LIBNET_CONFIG_CFLAGS="-I${prefix}/include"
+ LIBNET_CONFIG_LIBS="-L${prefix}/libs $LIBNET_CONFIG_LIBS"
+ ;;
+
*solaris*)
cat >> confdefs.h <<\EOF
#define HAVE_SOLARIS 1
diff -ru Libnet-1.0.2a.orig/include/libnet.h Libnet-1.0.2a/include/libnet.h
--- Libnet-1.0.2a.orig/include/libnet.h 2001-02-06 18:19:25.000000000 -0500
+++ Libnet-1.0.2a/include/libnet.h 2007-01-05 16:36:16.000000000 -0500
@@ -84,9 +84,9 @@
#define LIBNET_VERSION "1.0.2a"
#if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll "
+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the "
+"documentation regarding the libnet-config script."
#endif
#endif /* __LIBNET_H */
--- NEW FILE: libnet1.1.patch ---
diff -ru libnet.orig/Makefile.am libnet/Makefile.am
--- libnet.orig/Makefile.am 2004-03-10 15:57:09.000000000 -0500
+++ libnet/Makefile.am 2007-01-01 16:46:45.000000000 -0500
@@ -8,7 +8,7 @@
include $(top_srcdir)/Makefile.am.common
-SUBDIRS = include src sample
+SUBDIRS = include src
EXTRA_DIST = Makefile.am.common
diff -ru libnet.orig/configure.in libnet/configure.in
--- libnet.orig/configure.in 2004-03-01 15:26:11.000000000 -0500
+++ libnet/configure.in 2007-01-01 17:22:33.000000000 -0500
@@ -21,7 +21,7 @@
dnl
AC_PROG_CC
AC_PROG_INSTALL
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_CHECK_HEADERS(sys/sockio.h)
@@ -157,7 +157,10 @@
*darwin*)
AC_DEFINE(HAVE_SOCKADDR_SA_LEN)
- LIBNET_CONFIG_DEFINES="-DHAVE_SOCKADDR_SA_LEN"
+ AC_DEFINE(LIBNET_BSD_BYTE_SWAP)
+ LIBNET_CONFIG_DEFINES="-DHAVE_SOCKADDR_SA_LEN -DLIBNET_BSD_BYTE_SWAP"
+ LIBNET_CONFIG_CFLAGS="-I${prefix}/include"
+ LIBNET_CONFIG_LIBS="-L${prefix}/libs $LIBNET_CONFIG_LIBS"
;;
*solaris*)
@@ -229,6 +232,9 @@
esac
+LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
+AC_SUBST(LTLIBOBJS)
+
AC_OUTPUT(Makefile src/Makefile include/Makefile \
include/libnet/Makefile sample/Makefile version.h include/libnet.h \
libnet-config, chmod +x libnet-config)
diff -ru libnet.orig/src/Makefile.am libnet/src/Makefile.am
--- libnet.orig/src/Makefile.am 2004-03-11 13:50:20.000000000 -0500
+++ libnet/src/Makefile.am 2007-01-01 17:06:26.000000000 -0500
@@ -8,9 +8,9 @@
include $(top_srcdir)/Makefile.am.common
-lib_LIBRARIES = libnet.a
+lib_LTLIBRARIES = libnet.la
-libnet_a_SOURCES = libnet_asn1.c \
+libnet_la_SOURCES = libnet_asn1.c \
libnet_build_802.1q.c \
libnet_build_802.1x.c \
libnet_build_802.2.c \
@@ -57,15 +57,7 @@
libnet_version.c \
libnet_write.c
-EXTRA_libnet_a_SOURCES = libnet_link_bpf.c \
- libnet_link_dlpi.c \
- libnet_link_linux.c \
- libnet_link_nit.c \
- libnet_link_none.c \
- libnet_link_pf.c \
- libnet_link_snit.c \
- libnet_link_snoop.c \
- libnet_link_win32.c
+libnet_la_LIBADD = @LTLIBOBJS@
-libnet_a_LIBADD = @LIBOBJS@
+libnet_la_LDFLAGS = -release 1.1
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
