Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net In directory vz-cvs-3.sog:/tmp/cvs-serv29827/stable/main/finkinfo/net
Added Files: ngircd.info nipper-cli.info ntaim.info ntop.info ntop.patch offlineimap.info oinkmaster.info oinkmaster.patch opennap.info opennap.patch openvpn.info openvpn.patch oping.info p0f.info p0f.patch packit.info packit.patch par2.info par2.patch pchar.info pebrot.info pen.info pftp.info pgsnmpd.info pgsnmpd.patch picons.info pingtunnel.info Log Message: bunch of stuff to stable --- NEW FILE: p0f.info --- Package: p0f Version: 2.0.8 Revision: 1 License: LGPL Description: Passive OS fingerprinting, masquerade detect Source: http://lcamtuf.coredump.cx/%n/%n-%v.tgz Source-MD5: 1ccbcd8d4c95ef6dae841120d23c56a5 SourceDirectory: %n BuildDepends: fink (>= 0.24.12) PatchFile: %n.patch PatchFile-MD5: 971bb4544b85d55b640be4485930fa6c PatchScript: /usr/bin/sed 's|@PREFIX@|%p|g' %{PatchFile} | /usr/bin/patch -p1 CompileScript: << make all p0fq p0fping << InstallScript: << /usr/bin/install -m 755 -d %i/etc/%n /usr/bin/install -m 644 *.fp %i/etc/%n /usr/bin/install -m 755 -d %i/share/man/man1 /usr/bin/install -m 644 *.1 %i/share/man/man1 /usr/bin/install -m 755 -d %i/sbin /usr/bin/install -m 755 p0f p0frep test/p0fq test/p0fping %i/sbin << DocFiles: doc/* Homepage: http://lcamtuf.coredump.cx/p0f.shtml Maintainer: Rohan Lloyd <f...@rohanl.com> --- NEW FILE: ntop.info --- Package: ntop Version: 3.3 Revision: 2 Maintainer: None <fink-de...@lists.sourceforge.net> Depends: << cairo-shlibs (>= 1.8-1), expat1-shlibs, fontconfig2-shlibs (>= 2.4.1-1), freetype219-shlibs (>= 2.3.8-2), gdbm3-shlibs, glib2-shlibs (>= 0.18.0-1), glitz-shlibs, libgettext3-shlibs, libiconv, libpcap-shlibs (>= 0.9.8-1), libpng3-shlibs, librrd4-shlibs (>= 1.3.8-1), libxml2-shlibs (>= 2.6.32-1), net-snmp-unified15-shlibs (>= 5.4.2.1-4), pango1-xft2-ft219-shlibs (>= 1.22.4-2), pcre-shlibs, pixman-shlibs (>= 0.12.0-1), rrdtool (>= 1.3.8-1) << BuildDepends: << autoconf, automake1.10, cairo (>= 1.8-1), expat1, fink (>= 0.28), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.8-2), gdbm3, glib2-dev (>= 0.18.0-1), glitz-shlibs, libgettext3-dev, libiconv-dev, libpcap (>= 0.9.8-1), libpng3, libtool2, libxml2 (>= 2.6.32-1), net-snmp-unified15-dev (>= 5.4.2.1-4), net-snmp-unified (>= 5.4.2.1-4), pango1-xft2-ft219-dev (>= 1.22.4-2), pcre, pixman (>= 0.12.0-1), rrdtool-dev (>= 1.3.8-1), system-openssl-dev << Source: mirror:debian:pool/main/n/%n/%n_%v.orig.tar.gz Source-MD5: a0e52a85587c8a5519d822d04862dab4 SourceDirectory: %n-%v PatchFile: %n.patch PatchFile-MD5: 7f0c9633d5bfb28af40a72d9db898f2c PatchScript: << sed "s,@PREFIX@,%p,g" < %{PatchFile} | patch -p1 perl -pi -e 's/-shared/-module -avoid-version/' plugins/Makefile.am perl -pi -e 's/-release \@PACKAGE_VERSION\@//' plugins/Makefile.am << SetCPPFLAGS: -I%p/lib/system-openssl/include SetLDFLAGS: -L%p/lib/system-openssl/lib ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --disable-static --with-ssl --with-tcpwrap --enable-i18n --with-localedir=%p/share/locale CompileScript: << rm -f libtool.m4.in ltmain.sh aclocal.m4 acinclude.m4.in cp acinclude.m4.ntop acinclude.m4 autoreconf -fi ./configure %c make << InstallScript: << make install DESTDIR=%d << DocFiles: AUTHORS COPYING ChangeLog NEWS SUPPORT_NTOP.txt THANKS docs/1STRUN.txt docs/BUG_REPORT docs/FAQ* docs/HACKING docs/KNOWN_BUGS docs/README docs/TODO docs/database/README:README.database docs/database/README.mySQL:README.mySQL Shlibs: << ! %p/lib/libntop-3.3.dylib ! %p/lib/libntopreport-3.3.dylib << DescPackaging: << Upstream website is confusing, just pull debian's source. net-snmp's .la are in %N instead of %N15-dev. net-snmp-config publishes flags related to perl but ntop doesn't use or embed perl itself, so doesn't matter that they are not portable among system-perl perlversions. But remove /usr/local paths for safety (wish net-snmp already did that!). Install the ASN datafiles. << DescPort: << Fix upstream confusion about what a shared-library vs a loadable module is for building plugins. Avoid lots of non-portable darwin-specific hacks that aren't needed on modern unix-standard OS X. Leaving as -flat_namespace pending evidence that changing it is good (libnetsnmp is flat). Plugins cannot be -no-undefined because they need symbols from main shared-libraries but don't link them or specify -bundle_loader. Leaving alone until someone cares. "bool" is a defined type on darwin...#include the system header rather than setting a local typedef (header is already used via other #include spaghetti sometimes anyway) << DescUsage: << This version includes its own webserver (defaults to running on port 3000). Previous versions had a text interface (curses). If you want a text-based tool similar to the old ntop, try iftop. << Description: Network usage information via web interface License: GPL Homepage: http://www.ntop.org/ --- NEW FILE: packit.info --- Package: packit Version: 1.0 Revision: 2 PatchFile: %n.patch PatchFile-MD5: bab355c28fcddae80680a82078179c99 Description: Network auditing tool DescDetail: << Packit is a network auditing tool. Its value is derived from its ability to customize, inject, monitor, and manipulate IP traffic. By allowing you to define (spoof) nearly all TCP, UDP, ICMP, IP, ARP, RARP, and Ethernet header options, Packit can be useful in testing firewalls, intrusion detection systems, port scanning, simulating network traffic, and general TCP/IP auditing. Packit is also an excellent tool for learning TCP/IP. << ##### BuildDepends: libpcap, libnet1.1 (>= 1.1.2.1-3), fink (>= 0.24.12-1) Depends: libpcap-shlibs, libnet1.1-shlibs (>= 1.1.2.1-3) ##### Source: http://packit.sourceforge.net/downloads/%n-%v.tgz Source-MD5: 270594ff97f6c203131136208bb4d2ca ##### ConfigureParams: --bindir=%i/sbin --mandir=%i/share/man DocFiles: LICENSE ##### License: GPL Maintainer: sinclair44 <sinclai...@users.sourceforge.net> Homepage: http://packit.sourceforge.net/ --- NEW FILE: pchar.info --- Package: pchar Version: 1.5 Revision: 1 GCC: 4.0 Maintainer: Lars Eggert <lars.egg...@gmx.net> DocFiles: CHANGES FAQ README VERSION LICENSE Source: http://www.kitchenlab.org/www/bmah/Software/%n/%n-%v.tar.gz ConfigureParams: --mandir=%i/share/man Description: Tool for measuring Internet paths Homepage: http://www.kitchenlab.org/www/bmah/Software/pchar/ License: OSI-Approved Source-MD5: 1199a30db4b128b9acbc6979ca9b53e6 PatchScript: << tail -n 13 README > LICENSE << --- NEW FILE: p0f.patch --- diff -Naur p0f/README p0f.fink/README --- p0f/README 2006-09-06 19:42:16.000000000 +1000 +++ p0f.fink/README 2007-01-09 08:40:21.000000000 +1100 @@ -268,7 +268,7 @@ [ -FNODVUKAXMqxtpdlRL ] [ 'filter rule' ] -f file - read fingerprints from file; by default, p0f reads signatures - from ./p0f.fp or /etc/p0f/p0f.fp (the latter on Unix systems + from ./p0f.fp or @PREFIX@/etc/p0f/p0f.fp (the latter on Unix systems only). You can use this to load custom fingerprint data. Specifying multiple -f values will NOT combine several signature files together. diff -Naur p0f/config.h p0f.fink/config.h --- p0f/config.h 2006-09-06 19:42:37.000000000 +1000 +++ p0f.fink/config.h 2007-01-09 08:38:53.000000000 +1100 @@ -19,7 +19,7 @@ #ifdef WIN32 # define CONFIG_DIR "." #else -# define CONFIG_DIR "/etc/p0f" +# define CONFIG_DIR "@PREFIX@/etc/p0f" #endif /* WIN32 */ #define SYN_DB "p0f.fp" diff -Naur p0f/doc/README p0f.fink/doc/README --- p0f/doc/README 2006-09-06 19:42:16.000000000 +1000 +++ p0f.fink/doc/README 2007-01-09 08:40:21.000000000 +1100 @@ -268,7 +268,7 @@ [ -FNODVUKAXMqxtpdlRL ] [ 'filter rule' ] -f file - read fingerprints from file; by default, p0f reads signatures - from ./p0f.fp or /etc/p0f/p0f.fp (the latter on Unix systems + from ./p0f.fp or @PREFIX@/etc/p0f/p0f.fp (the latter on Unix systems only). You can use this to load custom fingerprint data. Specifying multiple -f values will NOT combine several signature files together. diff -Naur p0f/p0f.1 p0f.fink/p0f.1 --- p0f/p0f.1 2006-08-10 21:44:17.000000000 +1000 +++ p0f.fink/p0f.1 2007-01-09 08:40:09.000000000 +1100 @@ -32,7 +32,7 @@ .TP \fB-f\fR file read fingerprints from file; by default, p0f reads signatures -from ./p0f.fp or /etc/p0f/p0f.fp (the latter on Unix systems +from ./p0f.fp or @PREFIX@/etc/p0f/p0f.fp (the latter on Unix systems only). You can use this to load custom fingerprint data. Specifying multiple -f values will NOT combine several signature files together. @@ -269,7 +269,7 @@ You need to consult the documentation for an up-to-date list of issues. .SH FILES .TP -.BI /etc/p0f/p0f.fp\ /etc/p0f/p0fa.fp\ /etc/p0f/p0fr.fp\ /etc/p0f/p0fo.fp +.BI @PREFIX@/etc/p0f/p0f.fp\ @PREFIX@/etc/p0f/p0fa.fp\ @PREFIX@/etc/p0f/p0fr.fp\ @PREFIX@/etc/p0f/p0fo.fp default fingerprint database files .SH AUTHOR .B p0f diff -Naur p0f/p0f.c p0f.fink/p0f.c --- p0f/p0f.c 2006-08-22 00:16:00.000000000 +1000 +++ p0f.fink/p0f.c 2007-01-10 14:40:11.000000000 +1100 @@ -1813,12 +1813,19 @@ if (use_cache) { + char errbuf[PCAP_ERRBUF_SIZE]; + if(pcap_setnonblock(pt, 1, errbuf) == -1) { + debug("[!] Failed to set non blocking mode on device: %s", errbuf); + } + _s32 mfd,max; mfd = pcap_fileno(pt); max = 1 + (mfd > lsock ? mfd : lsock); + struct timeval timeout; + while (1) { fd_set f,e; @@ -1835,9 +1842,11 @@ raw socket, even with no SA_RESTART, it's a mess... select() is rather neutral. */ - select(max,&f,0,&e,0); + timeout.tv_sec = 1; + timeout.tv_usec = 0; + select(max,&f,0,&e,&timeout); - if (FD_ISSET(mfd, &f) || FD_ISSET(mfd,&e)) + // if (FD_ISSET(mfd, &f) || FD_ISSET(mfd,&e)) if (pcap_dispatch(pt,-1,(pcap_handler)&parse,0) < 0) break; if (FD_ISSET(lsock,&f)) { diff -Naur p0f/test/p0fq.c p0f.fink/test/p0fq.c --- p0f/test/p0fq.c 2006-08-21 22:29:49.000000000 +1000 +++ p0f.fink/test/p0fq.c 2007-01-10 14:40:11.000000000 +1100 @@ -52,7 +52,7 @@ d = inet_addr(argv[4]); dp = atoi(argv[5]); - if (!sp || !dp || s == INADDR_NONE || d == INADDR_NONE) + if (!dp || s == INADDR_NONE || d == INADDR_NONE) fatal("Bad IP/port values.\n"); sock = socket(PF_UNIX,SOCK_STREAM,0); --- NEW FILE: pebrot.info --- Package: pebrot Version: 0.8.8 Revision: 2 Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: 773392904defc14e6264832b0d0c620d Homepage: http://pebrot.sourceforge.net/ Maintainer: Pierre-Henri Lavigne <yakesonchih...@aim.com> License: GPL Description: MSN messenger text mode client DescDetail: << Pebrot is a text MSN messenger client implemented with Python. It has also a pretty and colorful Curses-based interface. It is developed under Linux and should work fine on any other *nixes. << BuildDepends: libncurses5 Depends: libncurses5-shlibs, python25 (>= 1:2.5.1-3) DocFiles: AUTHORS COPYING ChangeLog INSTALL PKG-INFO README logos pebrotrc CompileScript: << #!/bin/sh -ev %p/bin/python2.5 setup.py build << InstallScript: << #!/bin/sh -ev %p/bin/python2.5 setup.py install --root=%d --prefix=%p << --- NEW FILE: pgsnmpd.patch --- diff -Nurd pgsnmpd-1.0/Makefile pgsnmpd-1.0-patched/Makefile --- pgsnmpd-1.0/Makefile 2007-07-04 03:17:53.000000000 -0400 +++ pgsnmpd-1.0-patched/Makefile 2009-05-13 12:08:06.000000000 -0400 @@ -27,8 +27,8 @@ SNMPFLAGS=-I. -I./RDBMS-MIB_src $(shell net-snmp-config --cflags) AGENTLIBS=$(shell net-snmp-config --agent-libs) -PG_CPPFLAGS = -g -I$(libpq_srcdir) $(SNMPFLAGS) -PG_LIBS = $(libpq_pgport) $(AGENTLIBS) +PG_CPPFLAGS = -I$(PREFIX)/lib/system-openssl/include -g -I$(libpq_srcdir) $(SNMPFLAGS) +PG_LIBS = -Wl,-flat_namespace -L$(PREFIX)/lib/system-openssl/lib $(DYNALOADER) $(libpq_pgport) $(AGENTLIBS) DOCS = README.pgsnmpd --- NEW FILE: opennap.info --- Package: opennap Version: 0.44 Revision: 1 Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: 1dcce1826283888111fb9fbe0684f6f2 BuildDepends: fink (>= 0.24.12-1) PatchFile: %n.patch PatchFile-MD5: 3d2939965c0f09a7f7331827894b0e88 Maintainer: Jeffrey Ellis <supp...@groundlevel.net> Description: Open Source Napster Server for UNIX License: GPL DescDetail: << When doing the Install, OpenNap seems to be missing a directory called opennap which contains user config files for the app. This should be installed into /sw/share but is not during the installation process. There may be a way in the program to set this up, butyou can simply created it manually. All the files are derivative of some sample.xxx files which come with the uncompiled version in the root directory. One must rewrite those files according to the OpenNap manual -- apparently not with the instructions in the files themselves, which is outdated. Then remove "sample." from the file name and place the files in the /sw/share/opennap directory. Note: for OpenNap to work, at least the config and user files must be completed properly, with the user file containing at least one Elite user. Please see the manual.html included with the uncompiled package for full instructions. << DocFiles: AUTHORS COPYING FAQ INSTALL NEWS README TODO manual.html napster.txt notes.txt sample.block sample.channels sample.filter sample.motd sample.servers sample.users Homepage: http://opennap.sourceforge.net/ --- NEW FILE: picons.info --- Package: picons Description: Picture icons for various internet entities Version: 2006.09 Revision: 2 Homepage: http://www.cs.indiana.edu/pub/faces/picons/ Depends: picons-domains, picons-misc, picons-news, picons-unknown, picons-usenix, picons-users, picons-weather DocFiles: FAQ COPYRIGHT LICENSE License: Restrictive/Distributable Maintainer: Jesse Alama <al...@stanford.edu> Source: http://www.stanford.edu/~alama/picons.tar.bz2 Source-MD5: 0f671baf95749392952d7c2f2a1afbe9 CompileScript: << << InstallScript: << << SplitOff: << Package: picons-domains Description: Picture icons for internet domains DocFiles: README.domains FAQ COPYRIGHT LICENSE InstallScript: << mkdir -p %i/share/picons/domains cp -R domains/* %i/share/picons/domains << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, organizations, and so forth. This package contains the picons associated with domains. << << SplitOff2: << Package: picons-misc Description: Picture icons for common internet accounts DocFiles: README.misc FAQ COPYRIGHT LICENSE InstallScript: << mkdir -p %i/share/picons/misc/MISC cp -R misc/* %i/share/picons/misc/MISC << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, organizations, and so forth. This package contains the picons associated that don't fit into the other pigeon holes by which the picon database is divded. << << SplitOff3: << Package: picons-news Description: Picture icons for newsgroups and hierarchies DocFiles: README.unknown FAQ COPYRIGHT LICENSE InstallScript: << mkdir -p %i/share/picons/news cp -R news/* %i/share/picons/news << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, organizations, and so forth. This package contains the picons associated with Usenet newsgroups and hierarchies. << << SplitOff4: << Package: picons-unknown Description: Picture icons for high-level domains DocFiles: README.unknown FAQ COPYRIGHT LICENSE InstallScript: << mkdir -p %i/share/picons/unknown cp -R unknown/* %i/share/picons/unknown << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, organizations, and so forth. This package contains the picons associated high-level internet domains as a `smoking spy'. << << SplitOff5: << Package: picons-usenix Description: Picture icons for Usenix accounts DocFiles: README.usenix FAQ COPYRIGHT LICENSE InstallScript: << mkdir -p %i/share/picons/usenix cp -R usenix/* %i/share/picons/usenix << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, orgnazations, and so forth. This package contains the picons associated with USENIX users. << << SplitOff6: << Package: picons-users Description: Picture icons for specific internet accounts DocFiles: README.users FAQ COPYRIGHT LICENSE InstallScript: << mkdir -p %i/share/picons/users cp -R users/* %i/share/picons/users << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, orgazations, and so forth. This package contains the picons associated with particular users. << << SplitOff7: << Package: picons-weather Description: Picture icons for weather forecasts DocFiles: README.weather FAQ COPYRIGHT LICENSE InstallScript: << mkdir -p %i/share/picons/weather cp -R weather/* %i/share/picons/weather << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, orgnazations, and so forth. This package contains the picons associated with weather forecasts. << << DescDetail: << A picon is a picture icon, a little picture associated with an internet domain (such as ".org" or ".com"), particular people, orgnazations, and so forth. Installing this package will install the entire picon database. << --- NEW FILE: par2.info --- Package: par2 Version: 0.4 Revision: 1005 GCC: 4.0 Source: mirror:sourceforge:parchive/%ncmdline-%v.tar.gz Source-MD5: 1551b63e57e3c232254dc62073b723a9 SourceDirectory: %ncmdline-%v ConfigureParams: --mandir='${prefix}/share/man' BuildDepends: fink (>= 0.24.12) PatchFile: %n.patch PatchFile-MD5: 358a17f9dc7f5e6821b47a34c3596ee8 PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 CompileScript: << ./configure %c make << Description: Parity Archive Volume Set II DescDetail: << The idea behind this project is to provide a tool to apply the data-recovery capability concepts of RAID-like systems to the posting and recovery of multi-part archives on Usenet. Current filespec and clients support the 'Reed-Soloman Code' implementation that allows for recovery of any 'X' volumes for 'X' parity volumes present. The key to this mission is a clean file format specification which provides all the necessary capabilities for programs to easily verify and regenerate single missing parts out of a set of archives. We might just be able to make binary posting and downloading on Usenet a little easier. That's a pretty cool goal! << DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS PORTING README ROADMAP License: GPL Maintainer: H. Todd Fujinaka <ht...@twofifty.com> Homepage: http://parchive.sourceforge.net/ --- NEW FILE: ntaim.info --- Package: ntaim Version: 996288522 Revision: 1003 Source: mirror:sourceforge:taim/%n.%v.tar.gz Source-MD5: 471b1ee4479934698d8af53e6840a741 SourceDirectory: %n BuildDepends: libncurses5 (>= 5.4-20041023-1006) Depends: libncurses5-shlibs (>= 5.4-20041023-1006) DocFiles: BUGS COPYING NEWS README TODO # Maintainer: Jeremy Higgs <f...@higgs-family.net> Homepage: http://taim.sourceforge.net/ License: GPL Description: AIM client with an ncurses interface DescDetail: << nTAIM is an in-development AIM client that aims to provide all of the features available in the official AIM client within a command-line interface. It currently has ncurses support. The sourcecode includes the firetalk library, which is necessary for the functioning of the AIM client. << --- NEW FILE: ntop.patch --- diff -Nurd -x'*~' ntop-3.3.orig/Makefile.am ntop-3.3/Makefile.am --- ntop-3.3.orig/Makefile.am 2007-06-09 17:15:11.000000000 -0400 +++ ntop-3.3/Makefile.am 2009-05-28 23:05:29.000000000 -0400 @@ -157,8 +157,8 @@ .PHONY: snapshot -acinclude.m4: acinclude.m4.ntop libtool.m4.in - @cat acinclude.m4.ntop libtool.m4.in >acinclude.m4 +acinclude.m4: acinclude.m4.ntop + @cat acinclude.m4.ntop >acinclude.m4 CLEANLIST = `ls -l $(DESTDIR)$(libdir)/*ntop*.so $(DESTDIR)$(libdir)/*Plugin*.so | \ grep -v $(VERSION) | \ @@ -266,7 +266,7 @@ fi; \ done -install: install-recursive +install: install-recursive install-data-as @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) @@ -360,7 +360,6 @@ done install-data-local: ntop.txt ntop.html faq.html - @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins; @if ! test -d $(DESTDIR)/$(datadir)/ntop; then \ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \ touch $(DESTDIR)/$(datadir)/ntop/warnuser; \ diff -Nurd -x'*~' ntop-3.3.orig/configure.in ntop-3.3/configure.in --- ntop-3.3.orig/configure.in 2007-06-09 17:30:00.000000000 -0400 +++ ntop-3.3/configure.in 2009-05-29 00:09:52.000000000 -0400 @@ -159,6 +159,7 @@ AC_PROG_CPP AC_PROG_CC +AM_PROG_CC_C_O dnl> AC_PROG_CXX no c++ code (yet?) AC_PROG_INSTALL AC_PROG_LN_S @@ -360,7 +361,6 @@ echo echo "Checking C compiler program and features..." echo -AM_PROG_CC_STDC if test ".${ac_cv_prog_cc_stdc}" = ".no"; then echo echo "*******************************************************************" @@ -508,10 +508,6 @@ LOCALEDIR="/usr/lib/locale" fi -dnl> Add /usr/local/ -CFLAGS="${CFLAGS} -I/usr/local/include" -CPPFLAGS="${CPPFLAGS} -I/usr/local/include" -LDFLAGS="${LDFLAGS} -L/usr/local/lib" @@ -546,14 +542,7 @@ ) dnl> add pic flag in any case this makes sure all our code is relocatable -case "${target}:${CC}" in - *-*-darwin*:* ) - CFLAGS="$CFLAGS "`grep pic_flag= /usr/bin/glibtool | head -n1 | sed -e 's/.*pic_flag=//' -e 's/"//g'` - ;; - * ) - CFLAGS="$CFLAGS "`grep pic_flag= libtool | head -n1 | sed -e 's/.*pic_flag=//' -e 's/"//g'` - ;; -esac +dnl nah, just let libtool Do The Right Thing dnl> Presets for the make flags go here... CFLAGS="${CFLAGS}" @@ -1581,13 +1570,13 @@ AC_CHECK_TOOL(NETSNMP, net-snmp-config) if test "x$ac_cv_prog_ac_ct_NETSNMP" = "xnet-snmp-config"; then AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported]) - SNMPLIBS="`net-snmp-config --libs`" + SNMPLIBS="`net-snmp-config --libs | sed 's/-L\/usr\/local\/lib//g'`" SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`" echo "net-snmp libs: ${SNMPLIBS}" LIBS="${LIBS} ${SNMPLIBS}" dnl remove unecessary path LIBS=`echo ${LIBS}|sed -e s,'-R../lib',,g` - INCS="${INCS} `net-snmp-config --cflags`" + INCS="${INCS} `net-snmp-config --cflags | sed 's/-I\/usr\/local\/include//g'`" else AC_MSG_RESULT(NET-SNMP is not present: SNMP support is disabled) fi @@ -2088,7 +2077,7 @@ echo "#endif /* MEMORY_DEBUG */" >> version.c case "${host}" in - *darwin* ) + *darwin_skip-this-hack* ) echo echo "Copying patched versions of some configure-related files for Mac OS X" cp packages/MacOSX/lt* . diff -Nurd -x'*~' ntop-3.3.orig/configureextra/DARWIN ntop-3.3/configureextra/DARWIN --- ntop-3.3.orig/configureextra/DARWIN 2005-03-24 07:09:07.000000000 -0500 +++ ntop-3.3/configureextra/DARWIN 2009-05-28 22:30:42.000000000 -0400 @@ -1,13 +1,5 @@ #!/bin/sh echo " Setting Darwin (Mac OS X) specific flag values" -CFLAGS="-no-cpp-precomp $CFLAGS" -case "${target}" in - *-*-darwin5.5* ) - DYN_FLAGS="-bundle -flat_namespace -undefined suppress $DYN_FLAGS" - ;; - *-*-darwin8* ) CPPFLAGS="${CPPFLAGS} -DTIGER" - ;; -esac diff -Nurd -x'*~' ntop-3.3.orig/globals-defines.h ntop-3.3/globals-defines.h --- ntop-3.3.orig/globals-defines.h 2007-05-17 11:30:08.000000000 -0400 +++ ntop-3.3/globals-defines.h 2009-05-29 00:12:49.000000000 -0400 @@ -2051,7 +2051,7 @@ * default file and directories */ #define DEFAULT_NTOP_PIDFILE "ntop.pid" -#define DEFAULT_NTOP_PID_DIRECTORY "/var/run" +#define DEFAULT_NTOP_PID_DIRECTORY "@PREFIX@/var/run" /* * default configuration parameters -- the comment gives the (short getopt) name diff -Nurd -x'*~' ntop-3.3.orig/globals-structtypes.h ntop-3.3/globals-structtypes.h --- ntop-3.3.orig/globals-structtypes.h 2007-05-29 16:46:55.000000000 -0400 +++ ntop-3.3/globals-structtypes.h 2009-06-02 12:29:04.000000000 -0400 @@ -100,7 +100,11 @@ typedef char int8_t; #endif +#ifdef __APPLE__ +#include <stdbool.h> +#else typedef unsigned char bool; +#endif #include "fcUtils.h" #include "scsiUtils.h" diff -Nurd -x'*~' ntop-3.3.orig/plugins/Makefile.am ntop-3.3/plugins/Makefile.am --- ntop-3.3.orig/plugins/Makefile.am 2007-06-07 17:57:43.000000000 -0400 +++ ntop-3.3/plugins/Makefile.am 2009-05-28 21:16:26.000000000 -0400 @@ -42,16 +42,7 @@ # # The meat for ntop # -noinst_PROGRAMS = \ - icmpPlugin.so \ - lastSeenPlugin.so \ - netflowPlugin.so \ - pdaPlugin.so \ - remotePlugin.so \ - rrdPlugin.so \ - sflowPlugin.so - -lib_LTLIBRARIES = \ +plugin_LTLIBRARIES = \ libicmpPlugin.la \ liblastSeenPlugin.la \ libnetflowPlugin.la \ @@ -89,117 +80,12 @@ libsflowPlugin_la_LDFLAGS = -shared -release @PACKAGE_VERSION@ @DYN_FLAGS@ libsflowPlugin_la_CFLAGS = $(AM_CFLAGS) -# -# Dependencies to allow ntop loading plugins on-place -# by default ntop looks for plugins in the plugins/ subdirectory -# - - -.libs/libicmpPlugin.so@SO_VERSION_PATCH@: - @if test -f libicmpPlugin_la-icmpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ libicmpPlugin_la-icmpPlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ icmpPlugin.o; \ - fi - -icmpPlugin.so$(EXEEXT): .libs/libicmpPlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/libicmpPlugin.so icmpPlugin.so - -############### - -.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: - @if test -f liblastSeenPlugin_la-lastSeenPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ liblastSeenPlugin_la-lastSeenPlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ lastSeenPlugin.o; \ - fi - -lastSeenPlugin.so$(EXEEXT): .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/liblastSeenPlugin.so lastSeenPlugin.so - -############### - -.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: - @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o; \ - fi - -netflowPlugin.so$(EXEEXT): .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/libnetflowPlugin.so netflowPlugin.so - -############### - -.libs/libpdaPlugin.so@SO_VERSION_PATCH@: - @if test -f libpdaPlugin_la-pdaPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ libpdaPlugin_la-pdaPlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ pdaPlugin.o; \ - fi - -pdaPlugin.so$(EXEEXT): .libs/libpdaPlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/libpdaPlugin.so pdaPlugin.so - -############### - -.libs/libremotePlugin.so@SO_VERSION_PATCH@: - @if test -f libremotePlugin_la-remotePlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ libremotePlugin_la-remotePlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ remotePlugin.o; \ - fi - -remotePlugin.so$(EXEEXT): .libs/libremotePlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/libremotePlugin.so remotePlugin.so - -############### - -.libs/librrdPlugin.so@SO_VERSION_PATCH@: - @if test -f librrdPlugin_la-rrdPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ rrdPlugin.o; \ - fi - -rrdPlugin.so$(EXEEXT): .libs/librrdPlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/librrdPlugin.so rrdPlugin.so - -############### - -.libs/libsflowPlugin.so@SO_VERSION_PATCH@: - @if test -f libsflowPlugin_la-sflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o; \ - fi -sflowPlugin.so$(EXEEXT): .libs/libsflowPlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/libsflowPlugin.so sflowPlugin.so - -############### - -.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: - @if test -f libxmldumpPlugin_la-xmldumpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ libxmldumpPlugin_la-xmldumpPlugin.o; \ - else \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ xmldumpPlugin.o; \ - fi - -xmldumpPlugin.so$(EXEEXT): .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ - @$(LN_S) .libs/libxmldumpPlugin.so xmldumpPlugin.so - -############### - -install-data-local: - @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir); - @for file in $(noinst_PROGRAMS); do \ - cp -p $$file $(DESTDIR)$(plugindir)/$$file; \ - done -# remove installed libraries - @for file in $(lib_LTLIBRARIES); do \ - rm -f $(DESTDIR)$(libdir)/$$file; \ - done +# use -hook (runs after real install) instead of -local (runs before) +install-data-hook: + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) +# we dlopen(*), so nuke everything except the actual loadable .so files + rm -f $(DESTDIR)$(plugindir)/*.la # # Special stuff for xml auto-generation of code from the "doc": --- NEW FILE: packit.patch --- diff -Naur packit-0.7/src/globals.h packit-0.7.orig/src/globals.h --- packit-0.7/src/globals.h Fri Oct 3 05:52:08 2003 +++ packit-0.7.orig/src/globals.h Wed Feb 25 17:17:46 2004 @@ -31,7 +31,7 @@ #include <libnet.h> #include <pcap.h> #include <sys/types.h> -#include <net/bpf.h> +#include <pcap-bpf.h> #include <signal.h> #include <time.h> #include <stdio.h> diff -Naur packit-0.7/src/main.h packit-0.7.orig/src/main.h --- packit-0.7/src/main.h Sat Sep 27 10:22:52 2003 +++ packit-0.7.orig/src/main.h Wed Feb 25 17:18:19 2004 @@ -26,7 +26,7 @@ #include <libnet.h> #include <pcap.h> #include <sys/types.h> -#include <net/bpf.h> +#include <pcap-bpf.h> #include <signal.h> #include <time.h> #include <stdio.h> --- NEW FILE: pgsnmpd.info --- Info4: << Package: pgsnmpd Version: 1.0 Revision: 2 Source: http://pgfoundry.org/frs/download.php/1423/%n-%v.tgz Source-MD5: 93c6b3ada36f11e4d087896f147e3628 PatchFile: %n.patch PatchFile-MD5: 00d28b33e3869c6cb7e5d2ee6dca1fa0 BuildDepends: << fink (>= 0.28.0-1), net-snmp-unified15-dev (>= 5.4.2.1-4), postgresql82-dev, readline5, system-openssl-dev, << Depends: << net-snmp-unified15-shlibs (>= 5.4.2.1-4), postgresql82-shlibs, readline5-shlibs, << CompileScript: make PREFIX="%p" InstallScript: << install -d -m 755 %i/sbin install -c -m 755 pgsnmpd %i/sbin/ install -d -m 755 %i/etc install -c -m 640 pgsnmpd.conf %i/etc/ << ConfFiles: %p/etc/pgsnmpd.conf DocFiles: APPLICATION-MIB COPYRIGHT KNOWNBUG* RDBMS-MIB* README* TODO* doc/* Description: SNMP agent for PostgreSQL DescDetail: << pgsnmpd is an SNMP agent for PostgreSQL which implements RDBMS-MIB, as defined in RFC 1697. This MIB was developed by a group of representatives from different database manufacturers, and describes various attributes common to most relational database management systems. Because it was designed as the least common denominator, it doesn't show very much detail and there are definitely a number of things RDBMS-MIB doesn't cover that PostgreSQL administrators would be very interested in. Future versions of pgsnmpd will support a second MIB, tentatively called PGSQL-MIB, in addition to RDBMS-MIB. This PGSQL-MIB will be PostgreSQL-specific, and will include many more data points of interest to PostgreSQL users and administrators. << DescUsage: << The best way to use pgsnmpd is to enable AgentX in your net-snmp (this package is compatible both with the system net-snmp, and Fink's version) by adding the following lines in your snmpd.conf: master agentx agentXSocket tcp:localhost:705 Then, start pgsnmpd with the connection options to connect to your PostgreSQL database instance: %p/sbin/pgsnmpd -s -C "dbname=template1 user=postgres" << License: BSD Homepage: http://pgsnmpd.projects.postgresql.org/ Maintainer: Benjamin Reed <pgsn...@fink.racoonfink.com> << --- NEW FILE: pftp.info --- Package: pftp Version: 0.11.4mew6 Revision: 1002 BuildDepends: system-openssl-dev Source: http://pftpmew.tanesha.net/content/pftpfxp-v%v.tgz Source-MD5: 22528192327488a372a6de1f5d2709dc SourceDirectory: pftpfxp-mew PatchScript: perl -pi -e 's,new \(FILELIST \*\),new FILELIST \*,g' src/server.cc && perl -pi -e "s,-pthread,-lpthread,g" configure CompileScript: ./configure --openssldir %p/lib/system-openssl bsd && make dynamic InstallScript: mkdir -p %i/bin %i/share && cp -p src/pftp %i/bin/ && cp -pR .pftp %i/share/pftp DocFiles: README.MEW GCC: 4.0 License: OSI-Approved Homepage: http://pftpmew.tanesha.net Maintainer: Jack Fink <jackf...@users.sourceforge.net> Description: FTP/FXP client for the console --- NEW FILE: ngircd.info --- Package: ngircd Version: 0.13 Revision: 3 Source: ftp://ftp.berlios.de/pub/%n/%n-13.tar.gz Source-MD5: f26064f0232e050ddba6f312ad34ec94 Depends: libident-shlibs BuildDepends: libident, system-openssl-dev SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/include SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib ConfigureParams: --mandir=%p/share/man --with-extra-includes=%p/include --with-extra-libs=%p/lib --disable-dependency-tracking --with-tcp-wrappers --with-zeroconf --with-ident --enable-ipv6 --with-openssl PatchScript: perl -pi -e 's,-g -O,-O,g;s,-O2,-Os,g;' configure && perl -pi -e "s,Darwin,Marvin,g" contrib/MacOSX/Makefile.in InstallScript: make install DESTDIR=%d DocFiles: AUTHORS COPYING ChangeLog NEWS README Homepage: http://ngircd.barton.de Maintainer: Jack Fink <jackf...@users.sourceforge.net> License: GPL Description: Next generation IRC server --- NEW FILE: pingtunnel.info --- Package: pingtunnel Version: 0.71 Revision: 2 Source: http://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-%v.tar.gz Source-MD5: 9b04771d4fa50abc15a6af690b81c71a SourceDirectory: PingTunnel PatchScript: perl -pi -e 's,/usr,%p,;s,-g,-Os,g' Makefile CompileScript: make InstallScript: make install prefix=%i DocFiles: LICENSE:COPYING CHANGELOG:ChangeLog README License: BSD Homepage: http://www.cs.uit.no/~daniels/PingTunnel Maintainer: Jack Fink <jackf...@users.sourceforge.net> Description: Forwards TCP packets over ICMP --- NEW FILE: pen.info --- Package: pen Version: 0.17.1 Revision: 1 Maintainer: Martin Zdrahal <martin.zdra...@konflux.at> Source: ftp://siag.nu/pub/pen/%n-%v.tar.gz Source-MD5: 62548155d3bf42aea05b32227e132331 ConfigureParams: --mandir='%p/share/man' --with-docdir='%p/share/doc/%n' Description: Load balancer for simple tcp based protocol DescDetail: << Pen is a load balancer for "simple" tcp based protocols such as http or smtp. It allows several servers to appear as one to the outside and automatically detects servers that are down and distributes clients among the available servers. This gives high availability and scalable performance. << InstallScript: make install DESTDIR=%d License: GPL Homepage: http://siag.nu/pen/ --- NEW FILE: openvpn.info --- Package: openvpn Version: 2.2.0 Revision: 1 Description: Virtual private network daemon License: GPL Maintainer: Andreas Gockel <fink-open...@unixforge.de> Depends: lzo2-shlibs BuildDepends: fink (>= 0.24.12), lzo2, system-openssl-dev Suggests: gawk Source: http://swupdate.openvpn.net/community/releases/%n-%v.tar.gz Source-MD5: 4f440603eac45fec7be218b87d570834 PatchFile: %n.patch Patchfile-MD5: 10decc126b1e7a7fae3cf21c93fb50ee SetCPPFLAGS: -I%p/lib/system-openssl/include SetLDFLAGS: -L%p/lib/system-openssl/lib ConfigureParams: << --disable-dependency-tracking\ --disable-pkcs11\ --disable-selinux\ --enable-password-save\ --enable-x509-alt-username\ --mandir=%i/share/man\ --with-ifconfig-path=/sbin/ifconfig\ --with-route-path=/sbin/route << InstallScript: << /usr/bin/make install prefix=%i << DocFiles: << AUTHORS COPYING COPYRIGHT.GPL ChangeLog ChangeLog.IPv6 INSTALL NEWS PORTS README README-payload.IPv6 README.IPv6 TODO-payload.IPv6 TODO.IPv6 << Homepage: http://openvpn.net/ DescDetail: << OpenVPN is an application to securely tunnel IP networks over a single UDP or TCP port. It can be used to access remote sites, make secure point-to-point connections, enhance wireless security, etc. . OpenVPN uses all of the encryption, authentication, and certification features provided by the OpenSSL library (any cipher, key size, or HMAC digest). . OpenVPN may use static, pre-shared keys or TLS-based dynamic key exchange. It also supports VPNs with dynamic endpoints (DHCP or dial-up clients), tunnels over NAT or connection-oriented stateful firewalls (such as Linux's iptables). . Previous Maintainer: <= 2.0.7 ASARI Takashi <as...@users.sourceforge.net> << DescPort: << This Port includes all applicable patches from debian and a patch for undefined "IPV6_RECVPKTINFO" on BSD-based operating systems << --- NEW FILE: openvpn.patch --- diff -rauN openvpn-2.2.0/ChangeLog.IPv6 openvpn-2.2.0-debian/ChangeLog.IPv6 --- openvpn-2.2.0/ChangeLog.IPv6 1970-01-01 01:00:00.000000000 +0100 +++ openvpn-2.2.0-debian/ChangeLog.IPv6 2011-05-21 19:10:29.000000000 +0200 @@ -0,0 +1,394 @@ +Do 31. Dez 15:32:40 CET 2009 Gert Doering + + * Basic IPv6 p2mp functionality implemented + + * new options: + - server-ipv6 + - ifconfig-ipv6 + - ifconfig-ipv6-pool + - route-ipv6 + - iroute-ipv6 + + * modules touched: + - init.c: init & setup IPv6 route list & add/delete IPv6 routes + - tun.c: add "ifconfig" and "route" handling for IPv6 + - multi.c: IPv6 ifconfig-pool assignments [...8027 lines suppressed...] DWORD flags; int status; bool addr_defined; - struct sockaddr_in addr; + union { + struct sockaddr_in addr; + struct sockaddr_in6 addr6; + }; int addrlen; struct buffer buf_init; struct buffer buf; @@ -269,6 +272,8 @@ /* call self in a subprocess */ void fork_to_self (const char *cmdline); +const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); +int inet_pton(int af, const char *src, void *st); /* Find temporary directory */ const char *win_get_tempdir(); --- NEW FILE: par2.patch --- diff -Naur par2cmdline-0.4.orig/letype.h par2cmdline-0.4.new/letype.h --- par2cmdline-0.4.orig/letype.h 2010-03-02 09:02:28.000000000 -0800 +++ par2cmdline-0.4.new/letype.h 2010-03-02 09:05:28.000000000 -0800 @@ -28,44 +28,15 @@ #else -class leu16 +struct leu16 { -public: - leu16(void); - - leu16(const leu16 &other); - leu16& operator=(const leu16 &other); - - leu16(const u16 &other); leu16& operator=(const u16 &other); operator u16(void) const; -protected: u16 value; }; -inline leu16::leu16(void) -{ -} - -inline leu16::leu16(const leu16 &other) -: value(other.value) -{ -} - -inline leu16& leu16::operator =(const leu16 &other) -{ - value = other.value; - return *this; -} - -inline leu16::leu16(const u16 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); -} - inline leu16& leu16::operator=(const u16 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); @@ -81,46 +52,15 @@ } -class leu32 +struct leu32 { -public: - leu32(void); - - leu32(const leu32 &other); - leu32& operator=(const leu32 &other); - - leu32(const u32 &other); leu32& operator=(const u32 &other); operator u32(void) const; -protected: u32 value; }; -inline leu32::leu32(void) -{ -} - -inline leu32::leu32(const leu32 &other) -: value(other.value) -{ -} - -inline leu32& leu32::operator =(const leu32 &other) -{ - value = other.value; - return *this; -} - -inline leu32::leu32(const u32 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); - ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); - ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); -} - inline leu32& leu32::operator=(const u32 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); @@ -140,50 +80,15 @@ } -class leu64 +struct leu64 { -public: - leu64(void); - - leu64(const leu64 &other); - leu64& operator=(const leu64 &other); - - leu64(const u64 &other); leu64& operator=(const u64 &other); operator u64(void) const; -protected: u64 value; }; -inline leu64::leu64(void) -{ -} - -inline leu64::leu64(const leu64 &other) -: value(other.value) -{ -} - -inline leu64& leu64::operator =(const leu64 &other) -{ - value = other.value; - return *this; -} - -inline leu64::leu64(const u64 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); - ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); - ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); - ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff); - ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff); - ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff); - ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff); -} - inline leu64& leu64::operator=(const u64 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); diff -Naur par2cmdline-0.4.orig/md5.h par2cmdline-0.4.new/md5.h --- par2cmdline-0.4.orig/md5.h 2010-03-02 09:02:28.000000000 -0800 +++ par2cmdline-0.4.new/md5.h 2010-03-02 09:05:28.000000000 -0800 @@ -20,6 +20,13 @@ #ifndef __MD5_H__ #define __MD5_H__ +#ifdef WIN32 +#pragma pack(push, 1) +#define PACKED +#else +#define PACKED __attribute__ ((packed)) +#endif + // This file defines the MD5Hash and MD5Context objects which are used // to compute and manipulate the MD5 Hash values for a block of data. @@ -35,12 +42,11 @@ // MD5 Hash value -class MD5Hash -{ -public: - // Constructor does not initialise the value - MD5Hash(void) {}; +struct MD5Hash; +ostream& operator<<(ostream &s, const MD5Hash &hash); +struct MD5Hash +{ // Comparison operators bool operator==(const MD5Hash &other) const; bool operator!=(const MD5Hash &other) const; @@ -54,13 +60,8 @@ friend ostream& operator<<(ostream &s, const MD5Hash &hash); string print(void) const; - // Copy and assignment - MD5Hash(const MD5Hash &other); - MD5Hash& operator=(const MD5Hash &other); - -public: u8 hash[16]; // 16 byte MD5 Hash value -}; +} PACKED; // Intermediate computation state @@ -144,16 +145,9 @@ return !other.operator<(*this); } -inline MD5Hash::MD5Hash(const MD5Hash &other) -{ - memcpy(&hash, &other.hash, sizeof(hash)); -} - -inline MD5Hash& MD5Hash::operator=(const MD5Hash &other) -{ - memcpy(&hash, &other.hash, sizeof(hash)); - - return *this; -} +#ifdef WIN32 +#pragma pack(pop) +#endif +#undef PACKED #endif // __MD5_H__ diff -Naur par2cmdline-0.4.orig/reedsolomon.cpp par2cmdline-0.4.new/reedsolomon.cpp --- par2cmdline-0.4.orig/reedsolomon.cpp 2010-03-02 09:02:28.000000000 -0800 +++ par2cmdline-0.4.new/reedsolomon.cpp 2010-03-02 09:05:28.000000000 -0800 @@ -51,7 +51,7 @@ } } -bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) +template<> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) { inputcount = (u32)present.size(); @@ -80,7 +80,7 @@ return true; } -bool ReedSolomon<Galois8>::SetInput(u32 count) +template<> bool ReedSolomon<Galois8>::SetInput(u32 count) { inputcount = count; @@ -101,7 +101,7 @@ return true; } -bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) +template<> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) { // Look up the appropriate element in the RS matrix Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; @@ -189,7 +189,7 @@ // Set which of the source files are present and which are missing // and compute the base values to use for the vandermonde matrix. -bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) +template<> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) { inputcount = (u32)present.size(); @@ -233,7 +233,7 @@ // Record that the specified number of source files are all present // and compute the base values to use for the vandermonde matrix. -bool ReedSolomon<Galois16>::SetInput(u32 count) +template<> bool ReedSolomon<Galois16>::SetInput(u32 count) { inputcount = count; @@ -267,7 +267,7 @@ return true; } -bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) +template<> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) { // Look up the appropriate element in the RS matrix --- NEW FILE: offlineimap.info --- Package: offlineimap Version: 6.2.0 Revision: 3 Maintainer: Vincent Beffara <vbeff...@gmail.com> HomePage: http://software.complete.org/offlineimap License: GPL Description: Mailbox synchronization tool Source: http://software.complete.org/software/attachments/download/413/offlineimap_%v.orig.tar.gz Source-MD5: a23dab23ac08de063e330fe26d08e9b9 SourceDirectory: offlineimap Depends: python26 BuildDepends: docbook-utils, fink (>= 0.24.12) CompileScript: << %p/bin/python2.6 setup.py build %p/bin/docbook2man offlineimap.sgml %p/bin/docbook2man offlineimap.sgml << InstallScript: << %p/bin/python2.6 setup.py install --prefix=%p --root=%d mkdir -p %i/share/man/man1 cp offlineimap.1 %i/share/man/man1 /usr/bin/sed -i -e 's/^from/import locale; from/' %i/bin/offlineimap << DocFiles: COPYING COPYRIGHT FAQ.html UPGRADING offlineimap.conf* offlineimap.sgml --- NEW FILE: oinkmaster.patch --- diff -urN oinkmaster.orig/oinkmaster.conf oinkmaster/oinkmaster.conf --- oinkmaster.orig/oinkmaster.conf 2005-04-16 09:29:41.000000000 +0200 +++ oinkmaster/oinkmaster.conf 2005-05-11 13:17:03.000000000 +0200 @@ -92,7 +92,7 @@ # contains the Cygwin binaries and not the native Win32 binaries or # you will get problems. # Assume UNIX style by default: -path = /bin:/usr/bin:/usr/local/bin +path = @PREFIX@/bin:/bin:/usr/bin:/usr/local/bin # Example if running native Win32 or standalone Cygwin: # path = c:\oinkmaster;c:\oinkmaster\bin diff -urN oinkmaster.orig/oinkmaster.pl oinkmaster/oinkmaster.pl --- oinkmaster.orig/oinkmaster.pl 2005-04-16 09:29:41.000000000 +0200 +++ oinkmaster/oinkmaster.pl 2005-05-11 13:18:27.000000000 +0200 @@ -130,7 +130,7 @@ # Default locations for configuration file. my @DEFAULT_CONFIG_FILES = qw( - /etc/oinkmaster.conf + @PREFIX@/etc/oinkmaster.conf /usr/local/etc/oinkmaster.conf ); --- NEW FILE: oinkmaster.info --- Package: oinkmaster Version: 1.2 Revision: 1 Maintainer: Thomas Kotzian <thomas.kotz...@gmx.at> # BuildDepends: fink (>= 0.24.12) Depends: wget | wget-ssl, gzip, tar Source: mirror:sourceforge:%n/%n-%v.tar.gz PatchFile: %n.patch PatchFile-MD5: 87b99560b88af8aacc6da551743719ec PatchScript: sed -e 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 Source-MD5: 23dc212f3a5a93ab32253edb379cb724 CompileScript: echo "nothing to compile" InstallScript: << install -d %i/bin install -d %i/etc install -d %i/share/man/man1 install -m 644 oinkmaster.conf %i/etc install -m 755 oinkmaster.pl %i/bin install -m 644 oinkmaster.1 %i/share/man/man1 << # DocFiles: ChangeLog FAQ INSTALL LICENSE README* UPGRADING contrib/* template-examples.conf Description: Updater for your Snort 1.9+ rules DescDetail: << Oinkmaster is simple Perl script released under the BSD license to help you update your Snort 1.9+ rules and comment out the unwanted ones after each update. It will tell you exactly what had changed since the last update, hence giving you good control of your rules. << Homepage: http://oinkmaster.sf.net/ License: BSD --- NEW FILE: oping.info --- Package: oping Version: 0.3.5 Revision: 1005 Depends: liboping-shlibs (>= %v-%r) Source: http://verplant.org/liboping/files/liboping-%v.tar.bz2 Source-MD5: 0150a1c1ae6ce847b11543df31d4f952 ConfigureParams: --mandir=%p/share/man --with-extra-includes=%p/include --with-extra-libs=%p/lib --disable-dependency-tracking SetCFLAGS: -Os InstallScript: make install DESTDIR=%d DocFiles: AUTHORS ChangeLog COPYING NEWS README Homepage: http://verplant.org/liboping Maintainer: Jack Fink <jackf...@users.sourceforge.net> License: GPL Description: Generate ICMP Echo requests DescDetail: Works with IPv4 and IPv6 Splitoff: << Package: liboping-shlibs Description: Library for generating ICMP Echo requests, shared libraries Files: << lib/liboping.0.dylib lib/liboping.0.0.3.dylib << Shlibs: << %p/lib/liboping.0.dylib 1.0.0 %n (>= 0.3.5-1001) << DocFiles: COPYING README << Splitoff2: << Package: liboping Description: Library for generating ICMP Echo requests Depends: liboping-shlibs (= %v-%r) BuildDependsOnly: true Files: << share/man/man3 lib include << DocFiles: COPYING README << --- NEW FILE: nipper-cli.info --- Package: nipper-cli Version: 0.12.0 Revision: 1002 Depends: libnipper-shlibs (>= 0.12.5-1003) BuildDepends: cmake, libnipper (>= 0.12.5-1003) Source: mirror:sourceforge:nipper/%n-%v.tgz Source-MD5: 6a160cafb0c043e2330756a2b7b83daf PatchScript: perl -pi -e 's,/usr,%p,' CMakeLists.txt CompileScript: << cmake -DCMAKE_INSTALL_PREFIX:PATH=%p . perl -pi -e "s,-lnipper,-L%p/lib -lnipper," CMakeFiles/nipper-cli.dir/link.txt perl -pi -e "s,CXX_FLAGS =,CXX_FLAGS = -I%p/include," CMakeFiles/nipper-cli.dir/flags.make make << InstallScript: make install DESTDIR=%d DocFiles: LICENSE License: GPL Homepage: http://nipper.titania.co.uk Maintainer: Jack Fink <jackf...@users.sourceforge.net> Description: Network infrastructure parser - CLI version GCC: 4.0 --- NEW FILE: opennap.patch --- diff -uNbr opennap-0.44/config.cache opennap-0.44-new/config.cache --- opennap-0.44/config.cache 1969-12-31 19:00:00.000000000 -0500 +++ opennap-0.44-new/config.cache 2002-07-28 18:47:52.000000000 -0500 @@ -0,0 +1 @@ +ac_cv_func_mlockall=${ac_cv_func_mlockall=no} diff -uNbr opennap-0.44/init.c opennap-0.44-new/init.c --- opennap-0.44/init.c 2001-09-23 18:09:04.000000000 -0500 +++ opennap-0.44-new/init.c 2002-07-28 18:48:00.000000000 -0500 @@ -9,10 +9,10 @@ #endif #ifndef WIN32 +#include <sys/types.h> #include <grp.h> #include <pwd.h> #include <unistd.h> -#include <sys/types.h> #include <netdb.h> #include <limits.h> #endif /* !WIN32 */ ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs