OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 7... Line 7...
7   7  
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
Line 9... Line 9...
9 include $(INCLUDE_DIR)/kernel.mk 9 include $(INCLUDE_DIR)/kernel.mk
10   10  
11 PKG_NAME:=iptables 11 PKG_NAME:=iptables
Line 12... Line 12...
12 PKG_VERSION:=1.8.2 12 PKG_VERSION:=1.6.2
13 PKG_RELEASE:=3 13 PKG_RELEASE:=1
14   14  
15 PKG_SOURCE_PROTO:=git 15 PKG_SOURCE_PROTO:=git
Line 16... Line 16...
16 PKG_SOURCE_URL:=https://git.netfilter.org/iptables 16 PKG_SOURCE_URL:=https://git.netfilter.org/iptables
17 PKG_SOURCE_VERSION:=bba6bc692b0e6137e13881a1f398c134822e9f83 17 PKG_SOURCE_VERSION:=c16bdec15137b241586310d0e61bc88cc3726004
Line 18... Line 18...
18 PKG_MIRROR_HASH:=23a61d2a23fc0d587029690ef2564625d78fba4b2d90117edaf5b9eaf55bb7f9 18 PKG_MIRROR_HASH:=72e4bec94a56dd600097846c773e1074ff705e38f800ef221db646c064371a53
Line 87... Line 87...
87 - ACCEPT 87 - ACCEPT
88 - CT 88 - CT
89 - DNAT 89 - DNAT
90 - DROP 90 - DROP
91 - REJECT 91 - REJECT
92 - FLOWOFFLOAD -  
93 - LOG 92 - LOG
94 - MARK 93 - MARK
95 - MASQUERADE 94 - MASQUERADE
96 - REDIRECT 95 - REDIRECT
97 - SET 96 - SET
Line 104... Line 103...
104 - nat 103 - nat
105 - raw 104 - raw
Line 106... Line 105...
106   105  
Line 107... Line -...
107 endef -  
108   -  
109 define Package/iptables-nft -  
110 $(call Package/iptables/Default) -  
111 TITLE:=IP firewall administration tool nft -  
112 DEPENDS:=iptables @IPTABLES_NFTABLES +libxtables-nft -  
113 endef -  
114   -  
115 define Package/iptables-nft/description -  
116 Extra iptables nftables nft binaries. -  
117 iptables-nft -  
118 iptables-nft-restore -  
119 iptables-nft-save -  
120 iptables-translate -  
121 iptables-restore-translate -  
122 endef 106 endef
123   107  
124 define Package/iptables-mod-conntrack-extra 108 define Package/iptables-mod-conntrack-extra
125 $(call Package/iptables/Module, +kmod-ipt-conntrack-extra +kmod-ipt-raw) 109 $(call Package/iptables/Module, +kmod-ipt-conntrack-extra)
Line 126... Line 110...
126 TITLE:=Extra connection tracking extensions 110 TITLE:=Extra connection tracking extensions
127 endef 111 endef
Line 164... Line 148...
164 iptables extensions for packet content inspection. 148 iptables extensions for packet content inspection.
165 Includes support for: 149 Includes support for:
Line 166... Line 150...
166   150  
167 Matches: 151 Matches:
168 - string -  
Line 169... Line 152...
169 - bpf 152 - string
Line 170... Line 153...
170   153  
171 endef 154 endef
Line 451... Line 434...
451 CATEGORY:=Network 434 CATEGORY:=Network
452 TITLE:=IPv6 firewall administration tool 435 TITLE:=IPv6 firewall administration tool
453 MENU:=1 436 MENU:=1
454 endef 437 endef
Line 455... Line -...
455   -  
456 define Package/ip6tables-nft -  
457 $(call Package/iptables/Default) -  
458 DEPENDS:=ip6tables @IPTABLES_NFTABLES +libxtables-nft -  
459 TITLE:=IP firewall administration tool nft -  
460 endef -  
461   -  
462 define Package/ip6tables-nft/description -  
463 Extra ip6tables nftables nft binaries. -  
464 iptables-nft -  
465 iptables-nft-restore -  
466 iptables-nft-save -  
467 iptables-translate -  
468 iptables-restore-translate -  
Line 469... Line 438...
469 endef 438  
470   439  
471 define Package/ip6tables-extra 440 define Package/ip6tables-extra
472 $(call Package/iptables/Default) 441 $(call Package/iptables/Default)
Line 491... Line 460...
491 define Package/libiptc 460 define Package/libiptc
492 $(call Package/iptables/Default) 461 $(call Package/iptables/Default)
493 SECTION:=libs 462 SECTION:=libs
494 CATEGORY:=Libraries 463 CATEGORY:=Libraries
495 DEPENDS:=+libip4tc +libip6tc +libxtables 464 DEPENDS:=+libip4tc +libip6tc +libxtables
496 ABI_VERSION:=0 465 ABI_VERSION:=$(PKG_VERSION)
497 TITLE:=IPv4/IPv6 firewall - shared libiptc library (nf compatibility stub) 466 TITLE:=IPv4/IPv6 firewall - shared libiptc library (compatibility stub)
498 endef 467 endef
Line 499... Line 468...
499   468  
500 define Package/libip4tc 469 define Package/libip4tc
501 $(call Package/iptables/Default) 470 $(call Package/iptables/Default)
502 SECTION:=libs 471 SECTION:=libs
503 CATEGORY:=Libraries 472 CATEGORY:=Libraries
504 TITLE:=IPv4 firewall - shared libiptc library 473 TITLE:=IPv4 firewall - shared libiptc library
505 ABI_VERSION:=0 474 ABI_VERSION:=$(PKG_VERSION)
506 DEPENDS:=+libxtables 475 DEPENDS:=+libxtables
Line 507... Line 476...
507 endef 476 endef
508   477  
509 define Package/libip6tc 478 define Package/libip6tc
510 $(call Package/iptables/Default) 479 $(call Package/iptables/Default)
511 SECTION:=libs 480 SECTION:=libs
512 CATEGORY:=Libraries 481 CATEGORY:=Libraries
513 TITLE:=IPv6 firewall - shared libiptc library 482 TITLE:=IPv6 firewall - shared libiptc library
514 ABI_VERSION:=0 483 ABI_VERSION:=$(PKG_VERSION)
Line 515... Line 484...
515 DEPENDS:=+libxtables 484 DEPENDS:=+libxtables
516 endef 485 endef
517   486  
518 define Package/libxtables 487 define Package/libxtables
519 $(call Package/iptables/Default) 488 $(call Package/iptables/Default)
520 SECTION:=libs 489 SECTION:=libs
521 CATEGORY:=Libraries 490 CATEGORY:=Libraries
522 TITLE:=IPv4/IPv6 firewall - shared xtables library 491 TITLE:=IPv4/IPv6 firewall - shared xtables library
523 ABI_VERSION:=12 492 ABI_VERSION:=$(PKG_VERSION)
524 DEPENDS:= \ 493 DEPENDS:= \
Line 525... Line -...
525 +IPTABLES_CONNLABEL:libnetfilter-conntrack \ -  
526 +IPTABLES_NFTABLES:libnftnl -  
527 endef -  
528   -  
529 define Package/libxtables-nft -  
530 $(call Package/iptables/Default) -  
531 SECTION:=libs -  
532 CATEGORY:=Libraries -  
533 TITLE:=IPv4/IPv6 firewall - shared xtables nft library -  
534 ABI_VERSION:=12 494 +IPTABLES_CONNLABEL:libnetfilter-conntrack \
535 DEPENDS:=libxtables 495 +IPTABLES_NFTABLES:libnftnl
536 endef 496 endef
537   497  
Line 605... Line 565...
605 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext*.so $(1)/usr/lib/ 565 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext*.so $(1)/usr/lib/
606 endef 566 endef
Line 607... Line 567...
607   567  
608 define Package/iptables/install 568 define Package/iptables/install
609 $(INSTALL_DIR) $(1)/usr/sbin 569 $(INSTALL_DIR) $(1)/usr/sbin
610 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xtables-legacy-multi $(1)/usr/sbin/ 570 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xtables-multi $(1)/usr/sbin/
611 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables{,-restore,-save} $(1)/usr/sbin/ 571 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables{,-restore,-save} $(1)/usr/sbin/
612 $(INSTALL_DIR) $(1)/usr/lib/iptables 572 $(INSTALL_DIR) $(1)/usr/lib/iptables
Line 613... Line -...
613 endef -  
614   -  
615 define Package/iptables-nft/install -  
616 $(INSTALL_DIR) $(1)/usr/sbin -  
617 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xtables-nft-multi $(1)/usr/sbin/ -  
618 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-nft{,-restore,-save} $(1)/usr/sbin/ -  
619 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables{,-restore}-translate $(1)/usr/sbin/ -  
620 endef 573 endef
621   574  
622 define Package/ip6tables/install 575 define Package/ip6tables/install
623 $(INSTALL_DIR) $(1)/usr/sbin 576 $(INSTALL_DIR) $(1)/usr/sbin
Line 624... Line -...
624 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables{,-restore,-save} $(1)/usr/sbin/ -  
625 endef -  
626   -  
627 define Package/ip6tables-nft/install -  
628 $(INSTALL_DIR) $(1)/usr/sbin -  
629 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-nft{,-restore,-save} $(1)/usr/sbin/ -  
630 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables{,-restore}-translate $(1)/usr/sbin/ 577 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables{,-restore,-save} $(1)/usr/sbin/
631 endef 578 endef
632   579  
633 define Package/libiptc/install 580 define Package/libiptc/install
Line 634... Line 581...
634 $(INSTALL_DIR) $(1)/usr/lib 581 $(INSTALL_DIR) $(1)/usr/lib
635 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so.* $(1)/usr/lib/ 582 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so* $(1)/usr/lib/
636 endef 583 endef
637   584  
638 define Package/libip4tc/install 585 define Package/libip4tc/install
Line 639... Line 586...
639 $(INSTALL_DIR) $(1)/usr/lib 586 $(INSTALL_DIR) $(1)/usr/lib
640 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip4tc.so.* $(1)/usr/lib/ 587 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip4tc.so* $(1)/usr/lib/
641 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext4.so $(1)/usr/lib/ 588 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext4.so $(1)/usr/lib/
642 endef 589 endef
643   590  
Line 644... Line 591...
644 define Package/libip6tc/install 591 define Package/libip6tc/install
645 $(INSTALL_DIR) $(1)/usr/lib 592 $(INSTALL_DIR) $(1)/usr/lib
646 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip6tc.so.* $(1)/usr/lib/ 593 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip6tc.so* $(1)/usr/lib/
647 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext6.so $(1)/usr/lib/ 594 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext6.so $(1)/usr/lib/
648 endef 595 endef
Line 649... Line -...
649   -  
650 define Package/libxtables/install -  
651 $(INSTALL_DIR) $(1)/usr/lib -  
652 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so.* $(1)/usr/lib/ -  
653 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext.so $(1)/usr/lib/ -  
654 endef 596  
655   597 define Package/libxtables/install
656 define Package/libxtables-nft/install 598 $(INSTALL_DIR) $(1)/usr/lib
657 $(INSTALL_DIR) $(1)/usr/lib 599 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/
658 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext_*.so $(1)/usr/lib/ 600 $(CP) $(PKG_BUILD_DIR)/extensions/libiptext.so $(1)/usr/lib/
Line 671... Line 613...
671   613  
672 $$(eval $$(call BuildPackage,$(1))) 614 $$(eval $$(call BuildPackage,$(1)))
Line 673... Line 615...
673 endef 615 endef
674   -  
675 $(eval $(call BuildPackage,iptables)) 616  
676 $(eval $(call BuildPackage,iptables-nft)) 617 $(eval $(call BuildPackage,iptables))
677 $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m))) 618 $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m)))
678 $(eval $(call BuildPlugin,iptables-mod-conntrack-label,$(IPT_CONNTRACK_LABEL-m))) 619 $(eval $(call BuildPlugin,iptables-mod-conntrack-label,$(IPT_CONNTRACK_LABEL-m)))
679 $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m))) 620 $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
Line 695... Line 636...
695 $(eval $(call BuildPlugin,iptables-mod-nflog,$(IPT_NFLOG-m))) 636 $(eval $(call BuildPlugin,iptables-mod-nflog,$(IPT_NFLOG-m)))
696 $(eval $(call BuildPlugin,iptables-mod-trace,$(IPT_DEBUG-m))) 637 $(eval $(call BuildPlugin,iptables-mod-trace,$(IPT_DEBUG-m)))
697 $(eval $(call BuildPlugin,iptables-mod-nfqueue,$(IPT_NFQUEUE-m))) 638 $(eval $(call BuildPlugin,iptables-mod-nfqueue,$(IPT_NFQUEUE-m)))
698 $(eval $(call BuildPlugin,iptables-mod-checksum,$(IPT_CHECKSUM-m))) 639 $(eval $(call BuildPlugin,iptables-mod-checksum,$(IPT_CHECKSUM-m)))
699 $(eval $(call BuildPackage,ip6tables)) 640 $(eval $(call BuildPackage,ip6tables))
700 $(eval $(call BuildPackage,ip6tables-nft)) -  
701 $(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m))) 641 $(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m)))
702 $(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m))) 642 $(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m)))
703 $(eval $(call BuildPackage,libiptc)) 643 $(eval $(call BuildPackage,libiptc))
704 $(eval $(call BuildPackage,libip4tc)) 644 $(eval $(call BuildPackage,libip4tc))
705 $(eval $(call BuildPackage,libip6tc)) 645 $(eval $(call BuildPackage,libip6tc))
706 $(eval $(call BuildPackage,libxtables)) 646 $(eval $(call BuildPackage,libxtables))
707 $(eval $(call BuildPackage,libxtables-nft)) -