Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37733089
en ru br
Репозитории ALT
S:3.45.3-alt1.2
4.1: 3.42-alt3
4.0: 3.40.2-alt1
3.0: 3.33-alt1
www.altlinux.org/Changes

Группа :: Сети/Передача файлов
Пакет: httrack

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: httrack-3.47.3-alt-makefile.patch
Скачать

diff --git a/libtest/Makefile.am b/libtest/Makefile.am
index eb500c0..6e52f27 100644
--- a/libtest/Makefile.am
+++ b/libtest/Makefile.am
@@ -18,33 +18,33 @@ AM_LDFLAGS = -L../src
 
 # Examples
 libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
-libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libbaselinks_la_LDFLAGS = -version-info 1:0:0
 libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
-libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libchangecontent_la_LDFLAGS = -version-info 1:0:0
 libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
-libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libcontentfilter_la_LDFLAGS = -version-info 1:0:0
 libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
-libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libdisplayheader_la_LDFLAGS = -version-info 1:0:0
 libfilename2_la_SOURCES =  callbacks-example-filename2.c
-libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libfilename2_la_LDFLAGS = -version-info 1:0:0
 libfilename_la_SOURCES =  callbacks-example-filename.c
-libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libfilename_la_LDFLAGS = -version-info 1:0:0
 libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
-libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
 liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
-liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 liblistlinks_la_LDFLAGS = -version-info 1:0:0
 liblog_la_SOURCES =  callbacks-example-log.c
-liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 liblog_la_LDFLAGS = -version-info 1:0:0
 libsimple_la_SOURCES =  callbacks-example-simple.c
-libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) ../src/libhttrack.la
 libsimple_la_LDFLAGS = -version-info 1:0:0
 pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/libtest/callbacks-example-contentfilter.c b/libtest/callbacks-example-contentfilter.c
index 489f24c..cd61f0e 100644
--- a/libtest/callbacks-example-contentfilter.c
+++ b/libtest/callbacks-example-contentfilter.c
@@ -92,7 +92,6 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
 
 static int process(t_hts_callbackarg *carg, httrackp *opt, char* html, int len, const char* address, const char* filename) {
   t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
-  char * const stringfilter = userdef->stringfilter;
   char** const stringfilters = userdef->stringfilters;
   /* */
   int i = 0;
diff --git a/src/Makefile.am b/src/Makefile.am
index 9dfec26..8f46f62 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,8 @@ INCLUDES = \
 
 bin_PROGRAMS = proxytrack httrack htsserver
 
-httrack_LDADD = $(THREADS_LIBS) -lhttrack
-htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+httrack_LDADD = $(THREADS_LIBS) libhttrack.la
+htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
 proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
 
@@ -69,7 +69,7 @@ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)
 libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
 
 libhtsjava_la_SOURCES = htsjava.c htsjava.h
-libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack
+libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
 libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
 
 EXTRA_DIST = httrack.h webhttrack \
diff --git a/src/htsserver.c b/src/htsserver.c
index abcd1be..9c087d2 100644
--- a/src/htsserver.c
+++ b/src/htsserver.c
@@ -1286,7 +1286,6 @@ int smallserver(T_SOC soc,char* url,char* method,char* data, char* path) {
 
 int htslang_init(void) {
   if (NewLangList==NULL) {
-    int i = 0;
     NewLangList=inthash_new(NewLangListSz);
     if (NewLangList==NULL) {
       abortLog("Error in lang.h: not enough memory");
@@ -1533,7 +1532,6 @@ static void LANG_DELETE(void) {
 static void LANG_INIT(char* path) {
   //CWinApp* pApp = AfxGetApp();
   //if (pApp) {
-    int test = 0; /* pApp->GetProfileInt("Language","IntId",0); */
     LANG_T(path, 0 /*pApp->GetProfileInt("Language","IntId",0)*/ );
   //}
 }
@@ -1568,7 +1566,6 @@ static int LANG_LIST(char* path, char* buffer) {
   char lang_str[1024];
   int i = 0;
   int curr_lng=LANG_T(path, -1);
-  int found = 0;
   buffer[0] = '\0';
   do {
     QLANG_T(i);
diff --git a/src/httrack.c b/src/httrack.c
index d1f2f77..fb2b8ae 100644
--- a/src/httrack.c
+++ b/src/httrack.c
@@ -100,7 +100,6 @@ static int   __cdecl htsshow_savename(t_hts_callbackarg *carg, httrackp *opt, co
 static int   __cdecl htsshow_sendheader(t_hts_callbackarg *carg, httrackp *opt, char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* outgoing);
 static int   __cdecl htsshow_receiveheader(t_hts_callbackarg *carg, httrackp *opt, char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* incoming);
 
-static void vt_color(int text,int back);
 static void vt_clear(void);
 static void vt_home(void);
 
diff --git a/src/minizip/unzip.c b/src/minizip/unzip.c
index 1452a54..1472739 100644
--- a/src/minizip/unzip.c
+++ b/src/minizip/unzip.c
@@ -1526,7 +1526,6 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
     char *szComment;
     uLong uSizeBuf;
 {
-    int err=UNZ_OK;
     unz_s* s;
     uLong uReadThis ;
     if (file==NULL)
diff --git a/src/minizip/zip.c b/src/minizip/zip.c
index 7dc767f..ad1180e 100644
--- a/src/minizip/zip.c
+++ b/src/minizip/zip.c
@@ -188,14 +188,6 @@ local void init_linkedlist(ll)
     ll->first_block = ll->last_block = NULL;
 }
 
-local void free_linkedlist(ll)
-    linkedlist_data* ll;
-{
-    free_datablock(ll->first_block);
-    ll->first_block = ll->last_block = NULL;
-}
-
-
 local int add_data_in_datablock(ll,buf,len)
     linkedlist_data* ll;
     const void* buf;
diff --git a/src/mmsrip/mms.c b/src/mmsrip/mms.c
index 022f7ae..5e00ee2 100644
--- a/src/mmsrip/mms.c
+++ b/src/mmsrip/mms.c
@@ -163,9 +163,9 @@ mms_print_packet ( FILE *stddebug,
   fprintf ( stddebug, "\n-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" );
 
   if ( orig == MMS_SERVER )
-    fprintf ( stddebug, " command from server (%d bytes)\n", length );
+    fprintf ( stddebug, " command from server (%zd bytes)\n", length );
   else
-    fprintf ( stddebug, " command from client (%d bytes)\n", length );
+    fprintf ( stddebug, " command from client (%zd bytes)\n", length );
 
   fprintf ( stddebug, " start sequence: 0x%08x\n", mms_get_32(pak->buf, 0) );
   fprintf ( stddebug, " command id:     0x%08x\n", mms_get_32(pak->buf, 4) );
@@ -437,7 +437,7 @@ mms_recv_header_packet ( MMS *mms,
           packet_len = ( pre_header.buf[7] << 8 | pre_header.buf[6] ) - 8;
 
           if ( mms->stddebug != NULL )
-            fprintf ( mms->stddebug, "\nASF Header Packet (%d bytes)\n", packet_len );
+            fprintf ( mms->stddebug, "\nASF Header Packet (%zd bytes)\n", packet_len );
 
           if ( mms_recv_packet ( mms->socket, &tmp, packet_len, mms->quiet ) != 0 )
             {
@@ -558,9 +558,9 @@ mms_interp_header ( MMS *mms,
 
           if ( mms->stddebug != NULL )
             {
-              fprintf ( mms->stddebug, "File Properties Object (%lld bytes)\n", length );
+              fprintf ( mms->stddebug, "File Properties Object (%llu bytes)\n", length );
               fprintf ( mms->stddebug, " -> broadcast bit: %d\n", mms_get_32(header,i+64)&1 );
-              fprintf ( mms->stddebug, " -> min packet length: %d\n", packet_length );
+              fprintf ( mms->stddebug, " -> min packet length: %zd\n", packet_length );
               fprintf ( mms->stddebug, " -> max packet length: %d\n", mms_get_32(header, i+72) );
               fprintf ( mms->stddebug, " -> number of media packets: %d\n\n", mms_get_32(header, i+32) );
             }
@@ -594,7 +594,7 @@ mms_interp_header ( MMS *mms,
 
           if ( mms->stddebug != NULL )
             {
-              fprintf ( mms->stddebug, "Stream Object (%lld bytes)\n", length );
+              fprintf ( mms->stddebug, "Stream Object (%llu bytes)\n", length );
               fprintf ( mms->stddebug, " -> stream id: %d\n\n", stream_id );
             }
         }
@@ -603,28 +603,28 @@ mms_interp_header ( MMS *mms,
           mms->expected_file_size += ( length - 50 ); /* valid values are at least 50 bytes (why?) */
 
           if ( mms->stddebug != NULL )
-            fprintf ( mms->stddebug, "Data Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Data Object (%llu bytes)\n\n", length );
         }
       else if ( mms->stddebug != NULL )
         {
           if ( ( guid_1 == 0x6cce6200aa00d9a6ULL ) && ( guid_2 == 0x11cf668e75b22630ULL ) )
-            fprintf ( mms->stddebug, "Header Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Header Object (%llu bytes)\n\n", length );
           else if ( ( guid_1 == 0xcb4903c9a000f489ULL ) && ( guid_2 == 0x11cfe5b133000890ULL) )
-            fprintf ( mms->stddebug, "Simple Index Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Simple Index Object (%llu bytes)\n\n", length );
           else if ( ( guid_1 == 0xbe4903c9a0003490ULL ) && ( guid_2 == 0x11d135dad6e229d3ULL) )
-            fprintf ( mms->stddebug, "Index Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Index Object (%llu bytes)\n\n", length );
           else if ( ( guid_1 == 0x6553200cc000e38eULL ) && ( guid_2 == 0x11cfa92e5fbf03b5ULL) )
-            fprintf ( mms->stddebug, "Header Extension Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Header Extension Object (%llu bytes)\n\n", length );
           else if ( ( guid_1 == 0x6cce6200aa00d9a6ULL ) && ( guid_2 == 0x11cf668e75b22633ULL) )
-            fprintf ( mms->stddebug, "Content Description Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Content Description Object (%llu bytes)\n\n", length );
           else if ( ( guid_1 == 0x50a85ec9a000f097ULL ) && ( guid_2 == 0x11d2e307d2d0a440ULL) )
-            fprintf ( mms->stddebug, "Extended Content Description Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Extended Content Description Object (%llu bytes)\n\n", length );
           else if ( ( guid_1 == 0xf64803c9a000a4a3ULL ) && ( guid_2 == 0x11d0311d86d15240ULL) )
-            fprintf ( mms->stddebug, "Codec List Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Codec List Object (%llu bytes)\n\n", length );
           else if ( ( guid_1 == 0xb2a2c9976000828dULL ) && ( guid_2 == 0x11d1468d7bf875ceULL) )
-            fprintf ( mms->stddebug, "Stream Bitrate Properties Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Stream Bitrate Properties Object (%llu bytes)\n\n", length );
           else
-            fprintf ( mms->stddebug, "Unknown Object (%lld bytes)\n\n", length );
+            fprintf ( mms->stddebug, "Unknown Object (%llu bytes)\n\n", length );
         }
 
       i += length-24;
@@ -673,7 +673,7 @@ mms_recv_media_packet ( MMS *mms,
       packet_len = (pre_header.buf[7] << 8 | pre_header.buf[6]) - 8;
 
       if ( mms->stddebug != NULL )
-        fprintf ( mms->stddebug, "\nASF Media Packet (%d bytes)\n", packet_len );
+        fprintf ( mms->stddebug, "\nASF Media Packet (%zd bytes)\n", packet_len );
 
       memset ( pak->buf, 0, mms->media_packet_len );
 
diff --git a/configure.in b/configure.in
index 3e5b892..6e11373 100644
--- a/configure.in
+++ b/configure.in
@@ -13,10 +13,7 @@ AM_PROG_LIBTOOL
 AC_PROG_LN_S
 
 ### Default CFLAGS
-DEFAULT_CFLAGS=""
-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
--Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
--Wnested-externs -D_REENTRANT"
+DEFAULT_CFLAGS="-D_REENTRANT $CFLAGS"
 AC_SUBST(DEFAULT_CFLAGS)
 AC_SUBST(VERSION_INFO)
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin