[iptables] Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Tue Jul 29 19:04:42 CEST 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=ce5e35f466c4e1168b7f4b11bf7d9f8e6516e920
commit ce5e35f466c4e1168b7f4b11bf7d9f8e6516e920
Merge: 72ed4ff... 675e30f...
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jul 29 19:04:34 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Jul 29 19:04:34 2008 +0200

    Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables

commit 72ed4ffedd4ea97faf1e405e90f512f881c59386
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jul 29 19:04:11 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Jul 29 19:04:11 2008 +0200

    build: do not install ip{,6}tables.h
    
    These files do not contain anything that 3rd party modules could
    reasonably use.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  ce5e35f466c4e1168b7f4b11bf7d9f8e6516e920 (commit)
       via  72ed4ffedd4ea97faf1e405e90f512f881c59386 (commit)
      from  675e30f258952292972a562b71161b6d3cd77313 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce5e35f466c4e1168b7f4b11bf7d9f8e6516e920
Merge: 72ed4ffedd4ea97faf1e405e90f512f881c59386 675e30f258952292972a562b71161b6d3cd77313
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Jul 29 19:04:34 2008 +0200

    Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables

commit 72ed4ffedd4ea97faf1e405e90f512f881c59386
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Jul 29 19:04:11 2008 +0200

    build: do not install ip{,6}tables.h
    
    These files do not contain anything that 3rd party modules could
    reasonably use.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
These files do not contain anything that 3rd party modules could
reasonably use.

Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/Makefile.am b/Makefile.am
index 49edbf8..48561b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ man_MANS         := iptables.8 iptables-restore.8 iptables-save.8 \
                     ip6tables-save.8
 CLEANFILES       := iptables.8 ip6tables.8
 if ENABLE_DEVEL
-include_HEADERS  := include/xtables.h include/iptables.h include/ip6tables.h
+include_HEADERS  := include/xtables.h
 iptcdir           = ${includedir}/libiptc
 iptc_HEADERS     := include/libiptc/libxtc.h \
                     include/libiptc/ipt_kernel_headers.h



More information about the netfilter-cvslog mailing list