Hello community,
here is the log from the commit of package yast2-firewall
checked in at Thu Dec 7 19:56:02 CET 2006.
--------
--- yast2-firewall/yast2-firewall.changes 2006-10-26 17:31:33.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-firewall/yast2-firewall.changes 2006-12-04 16:42:19.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Dec 4 16:38:22 CET 2006 - locilka@suse.cz
+
+- A little help/description for firewall module in installation
+ proposal (using result of FATE #301151).
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-firewall-2.14.1.tar.bz2
New:
----
yast2-firewall-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.s7l3qd/_old 2006-12-07 19:54:47.000000000 +0100
+++ /var/tmp/diff_new_pack.s7l3qd/_new 2006-12-07 19:54:47.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firewall (Version 2.14.1)
+# spec file for package yast2-firewall (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-firewall
-Version: 2.14.1
+Version: 2.15.0
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firewall-2.14.1.tar.bz2
+Source0: yast2-firewall-2.15.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 >= 2.13.70
@@ -39,7 +39,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-firewall-2.14.1
+%setup -n yast2-firewall-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-firewall
%changelog -n yast2-firewall
+* Mon Dec 04 2006 - locilka@suse.cz
+- A little help/description for firewall module in installation
+ proposal (using result of FATE #301151).
+- 2.15.0
* Thu Oct 26 2006 - locilka@suse.cz
- Added and fixed firewall.rnc for checking AutoYaST profile
(#215248).
++++++ yast2-firewall-2.14.1.tar.bz2 -> yast2-firewall-2.15.0.tar.bz2 ++++++
++++ 5157 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/Makefile.am new/yast2-firewall-2.15.0/Makefile.am
--- old/yast2-firewall-2.14.1/Makefile.am 2006-10-26 17:39:03.000000000 +0200
+++ new/yast2-firewall-2.15.0/Makefile.am 2006-12-05 13:47:50.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/Makefile.am.common new/yast2-firewall-2.15.0/Makefile.am.common
--- old/yast2-firewall-2.14.1/Makefile.am.common 2006-10-26 17:39:03.000000000 +0200
+++ new/yast2-firewall-2.15.0/Makefile.am.common 2006-12-05 13:47:50.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/VERSION new/yast2-firewall-2.15.0/VERSION
--- old/yast2-firewall-2.14.1/VERSION 2006-10-26 16:55:52.000000000 +0200
+++ new/yast2-firewall-2.15.0/VERSION 2006-12-04 16:33:49.000000000 +0100
@@ -1 +1 @@
-2.14.1
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/autodocs-ycp.ami new/yast2-firewall-2.15.0/autodocs-ycp.ami
--- old/yast2-firewall-2.14.1/autodocs-ycp.ami 2006-10-26 17:39:03.000000000 +0200
+++ new/yast2-firewall-2.15.0/autodocs-ycp.ami 2006-12-05 13:47:50.000000000 +0100
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/configure.in new/yast2-firewall-2.15.0/configure.in
--- old/yast2-firewall-2.14.1/configure.in 2006-10-26 17:39:03.000000000 +0200
+++ new/yast2-firewall-2.15.0/configure.in 2006-12-05 13:47:50.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-firewall
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-firewall, 2.14.1, http://bugs.opensuse.org/, yast2-firewall)
+AC_INIT(yast2-firewall, 2.15.0, http://bugs.opensuse.org/, yast2-firewall)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.1"
+VERSION="2.15.0"
RPMNAME="yast2-firewall"
MAINTAINER="Lukas Ocilka "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile config/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/src/firewall_proposal.ycp new/yast2-firewall-2.15.0/src/firewall_proposal.ycp
--- old/yast2-firewall-2.14.1/src/firewall_proposal.ycp 2006-10-09 15:55:37.000000000 +0200
+++ new/yast2-firewall-2.15.0/src/firewall_proposal.ycp 2006-12-04 16:42:41.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Firewall configuration proposal
* Authors: Lukas Ocilka
*
- * $Id: firewall_proposal.ycp 25584 2005-09-23 07:53:09Z locilka $
+ * $Id: firewall_proposal.ycp 34735 2006-12-04 15:42:36Z locilka $
*/
{
@@ -22,6 +22,8 @@
import "Progress";
import "ProductFeatures";
+include "firewall/helps.ycp";
+
boolean enable_firewall_init_default = ProductFeatures::GetBooleanFeature ("globals", "enable_firewall");
boolean enable_ssh_default = ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh");
@@ -70,6 +72,7 @@
"firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal",
"firewall--enable_vnc_in_proposal", "firewall--disable_vnc_in_proposal",
],
+ "help" : HelpForDialog ("installation_proposal"),
];
Progress::set (progress_orig);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/src/helps.ycp new/yast2-firewall-2.15.0/src/helps.ycp
--- old/yast2-firewall-2.14.1/src/helps.ycp 2006-10-09 17:16:04.000000000 +0200
+++ new/yast2-firewall-2.15.0/src/helps.ycp 2006-12-04 16:42:41.000000000 +0100
@@ -6,7 +6,7 @@
* Summary: Firewall dialogs helps
* Authors: Lukas Ocilka
*
- * $Id: helps.ycp 33291 2006-10-09 15:15:59Z locilka $
+ * $Id: helps.ycp 34735 2006-12-04 15:42:36Z locilka $
*
* File includes helps for yast2-firewall dialogs.
*/
@@ -178,7 +178,11 @@
// TRANSLATORS: Additional Services dialog help 6/6
_("<p>The <b>Port Name</b> is a name assigned to a port number by the IANA
organization. One port number can have multiple port names assigned. Find
-the assignment currently in use in the <tt>/etc/services</tt> file.</p>")
+the assignment currently in use in the <tt>/etc/services</tt> file.</p>"),
+
+ // TRANSLATORS: help for Installation Proposal Dialog
+ "installation_proposal" : _("<p><b><big>Firewall</big></b><br />
+Firewall is a defensive mechanism that protects your computer from network attacks.</p>"),
];
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org