podbicie do wersji 5.2 plus poprawki patchy
budowałem na TH (th/th-test)
pozdrawiam
--
------------------------------------------------------------------------
Tomasz Rutkowski, sysadm @nospheratu.net, e-mail: [EMAIL PROTECTED]
my PGP key files could be found at http://tango.nospheratu.net
------------------------------------------------------------------------
--- amap.spec 2006-09-26 02:25:04.000000000 +0200
+++ moje/amap.spec 2006-09-26 23:36:50.000000000 +0200
@@ -2,12 +2,12 @@
Summary: Amap - a next-generation scanning tool
Summary(pl): Amap - skaner "nastêpnej generacji"
Name: amap
-Version: 4.7
+Version: 5.2
Release: 1
License: GPL
Group: Networking
-Source0: http://thc.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: c2ce244321b0b7b5eb28fdc785452b9a
+Source0: http://thc.segfault.net/releases/%{name}-%{version}.tar.gz
+# Source0-md5: e3b1f5ebd24aac03aacb38ec183eb426
Patch0: %{name}-destdir.patch
Patch1: %{name}-path.patch
URL: http://www.thc.org/
--- amap-5.2.orig/Makefile.am 2006-09-26 02:12:25.000000000 +0200
+++ amap-5.2/Makefile.am 2006-09-26 02:14:45.000000000 +0200
@@ -34,15 +34,15 @@
$(CC) $(OPT_DEBUG) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
install: all
- @echo Installing to $(PREFIX), change this by running ./configure --prefix=path
- -mkdir -vp $(PREFIX)$(BINDIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(DATADIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(MANDIR) 2> /dev/null
- -test -e amap.exe || cp -f amap amap6 amapcrap $(PREFIX)$(BINDIR)
- -test -e amap.exe && cp -f amap.exe amapcrap.exe $(PREFIX)$(BINDIR) || echo
- -cp -f $(SCRIPTS) $(PREFIX)$(DATADIR)
- -cp -f $(MANPAGE) $(PREFIX)$(MANDIR)
- -test $(PREFIX)$(BINDIR)/amap6 || cd $(PREFIX)$(BINDIR) && ln -s amap amap6
+ @echo Installing to $(DESTDIR)$(PREFIX), change this by running ./configure --prefix=path
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(MANDIR) 2> /dev/null
+ -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
+ -test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
+ -cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
+ -cp -f $(MANPAGE) $(DESTDIR)$(MANDIR)
+ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
clean:
cd pcre-3.9 && make clean
--- amap-5.2.orig/amap-lib.c 2005-09-07 23:22:24.000000000 +0200
+++ amap-5.2/amap-lib.c 2006-09-26 23:32:12.000000000 +0200
@@ -306,7 +306,7 @@
strcpy(file_name, AMAP_PREFIX);
if (file_name[strlen(file_name) - 1] != '/')
strcat(file_name, "/");
- strcat(file_name, "etc/");
+ strcat(file_name, "share/amap/");
strcat(file_name, AMAP_DEFAULT_FILENAME);
strcat(file_name, extension);
f = fopen(file_name, "r");
@@ -2034,7 +2034,7 @@
if (opt->filename == NULL) {
opt->filename = malloc(strlen(AMAP_PREFIX) + 5 + strlen(AMAP_DEFAULT_FILENAME) + 2);
strcpy(opt->filename, AMAP_PREFIX);
- strcat(opt->filename, "/etc/");
+ strcat(opt->filename, "/share/amap/");
strcat(opt->filename, AMAP_DEFAULT_FILENAME);
}
opt->file_log = malloc(strlen(opt->filename) + 6);
--- amap-5.2.orig/configure 2005-06-03 15:34:19.000000000 +0200
+++ amap-5.2/configure 2006-09-26 02:11:04.000000000 +0200
@@ -21,15 +21,13 @@
echo
echo "Starting amap auto configuration ..."
rm -f Makefile.in
-PREFIX=""
+PREFIX="/usr"
SSL_PATH=""
SSL_IPATH=""
CRYPTO_PATH=""
NSL_PATH=""
SOCKET_PATH=""
-MANDIR=""
LIBDIRS=`cat /etc/ld.so.conf 2> /dev/null`
-PREFIX=`echo "$1"|grep prefix=|sed 's/.*prefix=//i'`
echo
echo "Checking for openssl ..."
@@ -152,17 +150,6 @@
XLIBS="$XLIBS -lresolv"
fi
-for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
- if [ -d $i ]; then
- MANDIR=$i
- fi
-done
-if [ "X" = "X$MANDIR" ]; then
- MANDIR="/usr/local/man"
-fi
-echo "Manual page will be install to: $MANDIR"
-echo
-
if [ -d /usr/kerberos/include ]; then
XIPATHS="$XIPATHS -I/usr/kerberos/include"
fi
@@ -172,7 +159,7 @@
else
PREFIX="/usr/local"
fi
-echo "Amap will be installed into .../bin and .../etc of: $PREFIX"
+echo "Amap will be installed into .../bin and .../share of: $PREFIX"
echo " (change this by running ./configure --prefix=path)"
echo
@@ -181,7 +168,6 @@
echo "XLIBS=$XLIBS" >> Makefile.in
echo "XLIBPATHS=$XLIBPATHS" >> Makefile.in
echo "XIPATHS=$XIPATHS" >> Makefile.in
-echo "MANDIR=$MANDIR/man1/" >> Makefile.in
echo "PREFIX=$PREFIX" >> Makefile.in
echo >> Makefile.in
--- amap-5.2.orig/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2/Makefile.am 2006-09-26 02:10:50.000000000 +0200
@@ -3,7 +3,7 @@
OPT=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
-DATADIR=/etc
+DATADIR=/share/amap
MANDIR=/man/man1
SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
MANPAGE=amap.1
_______________________________________________
pld-devel-pl mailing list
pld-devel-pl@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
