mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
96a87b90ef
Fixed CVEs:
CVE-2018-16301
CVE-2019-15161
CVE-2019-15162
CVE-2019-15163
CVE-2019-15164
CVE-2019-15165
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry picked from commit 44f11353de)
78 lines
3.9 KiB
Diff
78 lines
3.9 KiB
Diff
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -588,14 +588,6 @@ install: install-shared install-archive
|
|
(mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
|
|
[ -d $(DESTDIR)$(includedir)/pcap ] || \
|
|
(mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)
|
|
- [ -d $(DESTDIR)$(mandir)/man1 ] || \
|
|
- (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
|
|
- [ -d $(DESTDIR)$(mandir)/man3 ] || \
|
|
- (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3)
|
|
- [ -d $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@ ] || \
|
|
- (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
|
|
- [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
|
|
- (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
|
|
for i in $(PUBHDR); do \
|
|
$(INSTALL_DATA) $(srcdir)/$$i \
|
|
$(DESTDIR)$(includedir)/$$i; done
|
|
@@ -605,59 +597,6 @@ install: install-shared install-archive
|
|
[ -d $(DESTDIR)$(libdir)/pkgconfig ] || \
|
|
(mkdir -p $(DESTDIR)$(libdir)/pkgconfig; chmod 755 $(DESTDIR)$(libdir)/pkgconfig)
|
|
$(INSTALL_DATA) libpcap.pc $(DESTDIR)$(libdir)/pkgconfig/libpcap.pc
|
|
- for i in $(MAN1); do \
|
|
- $(INSTALL_DATA) $(srcdir)/$$i \
|
|
- $(DESTDIR)$(mandir)/man1/$$i; done
|
|
- for i in $(MAN3PCAP_NOEXPAND); do \
|
|
- $(INSTALL_DATA) $(srcdir)/$$i \
|
|
- $(DESTDIR)$(mandir)/man3/$$i; done
|
|
- for i in $(MAN3PCAP_EXPAND:.in=); do \
|
|
- $(INSTALL_DATA) $$i \
|
|
- $(DESTDIR)$(mandir)/man3/$$i; done
|
|
- (cd $(DESTDIR)$(mandir)/man3 && \
|
|
- rm -f pcap_datalink_val_to_description.3pcap && \
|
|
- $(LN_S) pcap_datalink_val_to_name.3pcap \
|
|
- pcap_datalink_val_to_description.3pcap && \
|
|
- rm -f pcap_datalink_val_to_description_or_dlt.3pcap && \
|
|
- $(LN_S) pcap_datalink_val_to_name.3pcap \
|
|
- pcap_datalink_val_to_description_or_dlt.3pcap && \
|
|
- rm -f pcap_dump_fopen.3pcap && \
|
|
- $(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
|
|
- rm -f pcap_freealldevs.3pcap && \
|
|
- $(LN_S) pcap_findalldevs.3pcap pcap_freealldevs.3pcap && \
|
|
- rm -f pcap_perror.3pcap && \
|
|
- $(LN_S) pcap_geterr.3pcap pcap_perror.3pcap && \
|
|
- rm -f pcap_sendpacket.3pcap && \
|
|
- $(LN_S) pcap_inject.3pcap pcap_sendpacket.3pcap && \
|
|
- rm -f pcap_free_datalinks.3pcap && \
|
|
- $(LN_S) pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap && \
|
|
- rm -f pcap_free_tstamp_types.3pcap && \
|
|
- $(LN_S) pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap && \
|
|
- rm -f pcap_dispatch.3pcap && \
|
|
- $(LN_S) pcap_loop.3pcap pcap_dispatch.3pcap && \
|
|
- rm -f pcap_minor_version.3pcap && \
|
|
- $(LN_S) pcap_major_version.3pcap pcap_minor_version.3pcap && \
|
|
- rm -f pcap_next.3pcap && \
|
|
- $(LN_S) pcap_next_ex.3pcap pcap_next.3pcap && \
|
|
- rm -f pcap_open_dead_with_tstamp_precision.3pcap && \
|
|
- $(LN_S) pcap_open_dead.3pcap \
|
|
- pcap_open_dead_with_tstamp_precision.3pcap && \
|
|
- rm -f pcap_open_offline_with_tstamp_precision.3pcap && \
|
|
- $(LN_S) pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap && \
|
|
- rm -f pcap_fopen_offline.3pcap && \
|
|
- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline.3pcap && \
|
|
- rm -f pcap_fopen_offline_with_tstamp_precision.3pcap && \
|
|
- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap && \
|
|
- rm -f pcap_tstamp_type_val_to_description.3pcap && \
|
|
- $(LN_S) pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap && \
|
|
- rm -f pcap_getnonblock.3pcap && \
|
|
- $(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
|
|
- for i in $(MANFILE); do \
|
|
- $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
|
|
- $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
|
|
- for i in $(MANMISC); do \
|
|
- $(INSTALL_DATA) `echo $$i | sed 's/.manmisc.in/.manmisc/'` \
|
|
- $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
|
|
|
|
install-shared: install-shared-$(DYEXT)
|
|
install-shared-so: $(SHAREDLIB)
|