rpms/libnasl/devel libnasl-2.2.4.pki.patch, NONE, 1.1 libnasl-config.patch, NONE, 1.1 libnasl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Sat Mar 18 08:54:36 UTC 2006
Author: awjb
Update of /cvs/extras/rpms/libnasl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413/devel
Modified Files:
.cvsignore sources
Added Files:
libnasl-2.2.4.pki.patch libnasl-config.patch libnasl.spec
Log Message:
auto-import libnasl-2.2.6-2 on branch devel from libnasl-2.2.6-2.src.rpm
libnasl-2.2.4.pki.patch:
--- NEW FILE libnasl-2.2.4.pki.patch ---
diff -Naurp libnasl.orig/Makefile libnasl/Makefile
--- libnasl.orig/Makefile 2004-07-28 20:07:09.000000000 +0200
+++ libnasl/Makefile 2005-07-06 15:15:56.000000000 +0200
@@ -17,8 +17,9 @@ install: all
$(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1
$(INSTALL) -c -m 0644 doc/nasl.1 $(DESTDIR)${mandir}/man1
$(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1
- test -d $(DESTDIR)${localstatedir}/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}/nessus
- $(INSTALL) -c -m 0644 doc/nessus_org.pem $(DESTDIR)${localstatedir}/nessus/nessus_org.pem
+ test -d $(DESTDIR)${localstatedir}/lib/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}/lib/nessus
+ test -d $(DESTDIR)${sysconfdir}/pki/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${sysconfdir}/pki/nessus
+ $(INSTALL) -c -m 0644 doc/nessus_org.pem $(DESTDIR)${sysconfdir}/pki/nessus/nessus_org.pem
@echo
diff -Naurp libnasl.orig/nasl/Makefile libnasl/nasl/Makefile
--- libnasl.orig/nasl/Makefile 2005-02-10 17:03:51.000000000 +0100
+++ libnasl/nasl/Makefile 2005-07-06 15:10:46.000000000 +0200
@@ -126,13 +126,13 @@ nasl_init.o: nasl_init.c
nasl_crypto2.o: nasl_crypto2.c
- $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_crypto2.c
+ $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -DNESSUS_PKI_DIR=\"$(sysconfdir)/pki\" nasl_crypto2.c
nasl_server.o: nasl_server.c
- $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_server.c
+ $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" nasl_server.c
nasl_cmd_exec.o: nasl_cmd_exec.c
- $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_cmd_exec.c
+ $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" nasl_cmd_exec.c
nasl_func.o: nasl_func.c nasl_var.h
diff -Naurp libnasl.orig/nasl/nasl_crypto2.c libnasl/nasl/nasl_crypto2.c
--- libnasl.orig/nasl/nasl_crypto2.c 2005-03-19 23:23:49.000000000 +0100
+++ libnasl/nasl/nasl_crypto2.c 2005-07-06 15:08:37.000000000 +0200
@@ -798,7 +798,7 @@ char * map_file(char * filename, int * l
int generate_signed_script(char * filename)
{
RSA * rsa = NULL;
- FILE * fp = fopen(NESSUS_STATE_DIR "/nessus/nessus_org.priv.pem", "r");
+ FILE * fp = fopen(NESSUS_PKI_DIR "/nessus/nessus_org.priv.pem", "r");
unsigned char * result;
int len;
int i;
@@ -873,7 +873,7 @@ int verify_script_signature(char * filen
char * t;
unsigned char md[SHA_DIGEST_LENGTH+1];
RSA * rsa = NULL;
- FILE * fp = fopen(NESSUS_STATE_DIR "/nessus/nessus_org.pem", "r");
+ FILE * fp = fopen(NESSUS_PKI_DIR "/nessus/nessus_org.pem", "r");
char sig[16384];
unsigned char bin_sig[8192];
int binsz = 0;
@@ -885,7 +885,7 @@ int verify_script_signature(char * filen
if ( fp == NULL )
{
- fprintf(stderr, "Open %s/nessus/nessus_org.pem : %s\n", NESSUS_STATE_DIR, strerror(errno));
+ fprintf(stderr, "Open %s/nessus/nessus_org.pem : %s\n", NESSUS_PKI_DIR, strerror(errno));
return -1;
}
libnasl-config.patch:
--- NEW FILE libnasl-config.patch ---
--- nasl-config.in.orig 2006-02-24 11:21:23.000000000 +0100
+++ nasl-config.in 2006-02-24 11:21:46.000000000 +0100
@@ -12,8 +12,8 @@
PREFIX=@prefix@
-LIBDIR=$PREFIX/lib
-INCLUDEDIR=$PREFIX/include
+LIBDIR=@libdir@
+INCLUDEDIR=@includedir@
VERSION=@version@
usage()
--- NEW FILE libnasl.spec ---
Name: libnasl
Version: 2.2.6
Release: 2%{?dist}
Summary: Nessus Attack Scripting Language
Group: System Environment/Libraries
License: GPL
URL: http://www.nessus.org
Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz
Patch0: libnasl-config.patch
Patch1: libnasl-2.2.4.pki.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bison
BuildRequires: libpcap
BuildRequires: nessus-libraries-devel >= %{version}
BuildRequires: tetex-dvips
BuildRequires: tetex-latex
%description
NASL is a scripting language designed for the Nessus security scanner.
Its aim is to allow anyone to write a test for a given security hole
in a few minutes, to allow people to share their tests without having
to worry about their operating system, and to guarantee everyone that
a NASL script can not do anything nasty except performing a given
security test against a given target.
Thus, NASL allows you to easily forge IP packets, or to send regular
packets. It provides you some convenient functions that will make the
test of web and FTP server more easy to write. NASL garantees you that
a NASL script:
- will not send any packet to a host other than the target host,
- will not execute any commands on your local system.
%package devel
Summary: Nessus Attack Scripting Language header files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains the files needed for development
with %{name}.
%prep
%setup -q -n %{name}
%patch0
%patch1 -p1
%build
%configure --enable-shared --disable-static --with-pic
#smp_mflags will breake build
make
cd doc
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/libnasl.la
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING doc/nasl_guide.ps doc/nasl_guide.dvi
%{_bindir}/nasl
%{_libdir}/libnasl.so.*
%{_mandir}/man1/nasl.1*
%{_localstatedir}/lib/nessus
%{_sysconfdir}/pki/nessus
%files devel
%defattr(-,root,root,-)
%{_bindir}/nasl-config
%{_libdir}/libnasl.so
%{_includedir}/nessus
%{_mandir}/man1/nasl-config.1*
%changelog
* Fri Feb 24 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-2
- add pki location patch
- tune BR
- honor now localstatedir
* Fri Feb 24 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-1
- initial version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnasl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Mar 2006 08:53:38 -0000 1.1
+++ .cvsignore 18 Mar 2006 08:54:36 -0000 1.2
@@ -0,0 +1 @@
+libnasl-2.2.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnasl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Mar 2006 08:53:38 -0000 1.1
+++ sources 18 Mar 2006 08:54:36 -0000 1.2
@@ -0,0 +1 @@
+06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz
More information about the scm-commits
mailing list