Changeset 27000
- Timestamp:
- 2011-05-24T12:42:49+02:00 (7 years ago)
- Location:
- trunk/package/libpcap
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/package/libpcap/Makefile
r26999 r27000 39 39 40 40 TARGET_CFLAGS += \ 41 $(FPIC) \42 41 -ffunction-sections \ 43 42 -fdata-sections -
trunk/package/libpcap/patches/100-debian_shared_lib.patch
r26995 r27000 62 62 MAN1 = pcap-config.1 63 63 64 @@ -324, 7 +338,7@@ EXTRA_DIST = \64 @@ -324,21 +338,14 @@ EXTRA_DIST = \ 65 65 Win32/Src/inet_net.c \ 66 66 Win32/Src/inet_pton.c … … 71 71 libpcap.a: $(OBJ) 72 72 @rm -f $@ 73 @@ -409,6 +423,13 @@ libpcap.shareda: $(OBJ) 73 ar rc $@ $(OBJ) $(ADDLARCHIVEOBJS) 74 $(RANLIB) $@ 75 76 -shared: libpcap.$(DYEXT) 77 - 78 -libpcap.so: $(OBJ) 79 - @rm -f $@ 80 - VER=`cat $(srcdir)/VERSION`; \ 81 - MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \ 82 - @V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER $(LDFLAGS) \ 83 - -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS) 84 +shared: $(SHAREDLIB) 85 86 # 87 # The following rule succeeds, but the result is untested. 88 @@ -409,6 +416,13 @@ libpcap.shareda: $(OBJ) 74 89 # 75 90 libpcap.none: … … 85 100 @rm -f $@ 86 101 $(srcdir)/runlex.sh $(LEX) -o$@ $< 87 @@ -416,6 +43 7,9 @@ scanner.c: $(srcdir)/scanner.l102 @@ -416,6 +430,9 @@ scanner.c: $(srcdir)/scanner.l 88 103 scanner.o: scanner.c tokdefs.h 89 104 $(CC) $(CFLAGS) -c scanner.c … … 95 110 96 111 tokdefs.h: grammar.c 97 @@ -429,9 +4 53,17 @@ grammar.o: grammar.c112 @@ -429,9 +446,17 @@ grammar.o: grammar.c 98 113 @rm -f $@ 99 114 $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c … … 113 128 $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c 114 129 115 @@ -469,6 + 501,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt130 @@ -469,6 +494,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt 116 131 bpf_filter.o: bpf_filter.c 117 132 $(CC) $(CFLAGS) -c bpf_filter.c … … 123 138 # Generate the pcap-config script. 124 139 # 125 @@ -604,6 +639,9 @@ install-archive-so install-archive-dylib 140 @@ -562,14 +590,12 @@ install: install-shared install-archive 141 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done 142 143 install-shared: install-shared-$(DYEXT) 144 -install-shared-so: libpcap.so 145 +install-shared-so: $(SHAREDLIB) 146 [ -d $(DESTDIR)$(libdir) ] || \ 126 147 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 127 $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a 128 $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a 148 - VER=`cat $(srcdir)/VERSION`; \ 149 - MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \ 150 - $(INSTALL_PROGRAM) libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$VER; \ 151 - ln -sf libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \ 152 - ln -sf libpcap.so.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.so 129 153 + $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ 130 154 + ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) 131 155 + ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) 132 install- archive-shareda:133 #134 # AIX, however, doesn't, so we don't install the archive156 install-shared-dylib: libpcap.dylib 157 [ -d $(DESTDIR)$(libdir) ] || \ 158 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 135 159 --- a/configure 136 160 +++ b/configure -
trunk/package/libpcap/patches/102-makefile_disable_manpages.patch
r26999 r27000 1 1 --- a/Makefile.in 2 2 +++ b/Makefile.in 3 @@ -53 9,62 +539,12 @@ install: install-shared install-archive3 @@ -532,62 +532,12 @@ install: install-shared install-archive 4 4 (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) 5 5 [ -d $(DESTDIR)$(includedir)/pcap ] || \ … … 63 63 64 64 install-shared: install-shared-$(DYEXT) 65 install-shared-so: libpcap.so66 @@ -6 54,23 +604,6 @@ uninstall: uninstall-shared65 install-shared-so: $(SHAREDLIB) 66 @@ -642,23 +592,6 @@ uninstall: uninstall-shared 67 67 rm -f $(DESTDIR)$(includedir)/$$i; done 68 68 -rmdir $(DESTDIR)$(includedir)/pcap -
trunk/package/libpcap/patches/202-protocol_api.patch
r26999 r27000 106 106 } 107 107 108 @@ -318,6 +320,15 @@ pcap_set_buffer_size(pcap_t *p, int buff 108 @@ -317,6 +319,15 @@ pcap_set_buffer_size(pcap_t *p, int buff 109 return 0; 109 110 } 110 111 111 112 +int 112 113 +pcap_set_protocol(pcap_t *p, unsigned short proto) 113 114 +{ … … 118 119 +} 119 120 + 120 +int121 int 121 122 pcap_activate(pcap_t *p) 122 123 { 123 int status;124 124 --- a/pcap/pcap.h 125 125 +++ b/pcap/pcap.h
Note: See TracChangeset
for help on using the changeset viewer.