소스 검색

Update version, and fix new build problems by adding missing SSL dependency and reordering LIBS

Michael Schloh von Bennewitz 22 년 전
부모
커밋
831f62a19a
1개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 5 3
      nmap/nmap.spec

+ 5 - 3
nmap/nmap.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Network
 License:      GPL
-Version:      3.45
-Release:      20030918
+Version:      3.46
+Release:      20030922
 
 #   list of sources
 Source0:      http://www.insecure.org/nmap/dist/nmap-%{version}.tgz
@@ -41,7 +41,7 @@ Source0:      http://www.insecure.org/nmap/dist/nmap-%{version}.tgz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030909, make, gcc, flex, bison, getopt
+BuildPreReq:  OpenPKG, openpkg >= 20030909, make, gcc, flex, bison, getopt, openssl
 PreReq:       OpenPKG, openpkg >= 20030909, getopt
 AutoReq:      no
 AutoReqProv:  no
@@ -61,6 +61,7 @@ AutoReqProv:  no
     %setup -q
     %{l_shtool} subst \
         -e 's;/usr/local/;%{l_prefix}/;g' \
+        -e 's;$LIBS -lnsock;-lnsock $LIBS;g' \
         configure */configure
 
 %build
@@ -72,6 +73,7 @@ AutoReqProv:  no
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O} $cppflags" \
     CXXFLAGS="%{l_cxxflags -O} $cppflags" \
+    LDFLAGS="%{l_ldflags}" \
     ./configure \
         --prefix=%{l_prefix} \
         --without-nmapfe