July 2014 - openSUSE Commits - openSUSE Mailing Lists

commit libibverbs for openSUSE:Factory
by root＠hilbert.suse.de 04 Jul '14

04 Jul '14

Hello community, here is the log from the commit of package libibverbs for openSUSE:Factory checked in at 2014-07-04 09:34:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libibverbs (Old) and /work/SRC/openSUSE:Factory/.libibverbs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libibverbs" Changes: -------- New Changes file: --- /dev/null 2014-06-12 08:28:52.960034756 +0200 +++ /work/SRC/openSUSE:Factory/.libibverbs.new/libibverbs.changes 2014-07-04 09:34:27.000000000 +0200 @@ -0,0 +1,198 @@ +------------------------------------------------------------------- +Thu Jun 26 12:45:56 CEST 2014 - pth(a)suse.de + +- Do not build & package the static lib. +- Add baselibs.conf as source. + +------------------------------------------------------------------- +Tue Jun 3 11:24:34 CEST 2014 - pth(a)suse.de + +- Update to OFED 3.12 final. + +------------------------------------------------------------------- +Thu Apr 10 15:16:13 UTC 2014 - stefan.fent(a)suse.com + +- removed unneeded patches for new version: + libibverbs-Infrastructure_to_support_verbs_extensions.patch + libibverbs-XRC_man_pages.patch + libibverbs-Add_support_for_XRC_SRQs.patch + libibverbs-Introduce_XRC_domains_XRCDs.patch + libibverbs-Use-IBV_SEND_INLINE-in-example-pingpong-programs.patch + libibverbs-Add_ibv_open_qp_for_XRC_receive_QPs.patch + libibverbs-Add_support_for_XRC_QPs.patch + libibverbs-Add_XRC_sample_application.patch + libibverbs-Add-general-definitions-to-support-uverbs-extensions.patch + libibverbs-Fix_XRC_sample_application_ibv_xsrq_pingpong_issues.patch + +------------------------------------------------------------------- +Thu Apr 3 11:41:39 CEST 2014 - pth(a)suse.de + +- Fix underquoting and change AC_HELP_MESSAGE to AS_HELP_MESSAGE + in libibverbs-Use-neighbour-lookup-for-RoCE-UD-QPs-Eth-L2-resoluti.patch +- Add libibverbs-autotools.patch that correctly quotes another + AS_HELP_MESSGE call and a use of AC_MSG_ERROR. + +------------------------------------------------------------------- +Mon Mar 31 18:52:02 CEST 2014 - pth(a)suse.de + +- Add patches from Mellanox (bnc#871161): + * libibverbs-Add-ibv_port_cap_flags.patch + Add ibv_port_cap_flag + * libibverbs-Use-neighbour-lookup-for-RoCE-UD-QPs-Eth-L2-resoluti.patch + Use neighbour lookup for RoCE UD QPs Eth L2 resolution. + * libibverbs-Add-ibv_query_port_ex-support.patch + Add extended support for ibv_query_port. + * libibverbs-Add-receive-flow-steering-support.patch + Add support to steer receiving flows. + +------------------------------------------------------------------- +Mon Mar 31 15:43:20 CEST 2014 - pth(a)suse.de + +- Fix libibverbs-s390.patch to not make header unusable. + +------------------------------------------------------------------- +Fri Mar 28 18:33:34 CET 2014 - pth(a)suse.de + +- Fix spec file to get ibdev2netdev installed in the rigth place. +- Adapt libibverbs-s390.patch to changed sources. + +------------------------------------------------------------------- +Thu Mar 27 15:41:54 CET 2014 - pth(a)suse.de + +- On request from Mellanox add the ibdev2netdev script from + the compat-rdma package in OFED. This script shows which IB + device is attached to which network device (bnc#870419). + +------------------------------------------------------------------- +Thu Mar 20 00:21:09 CET 2014 - ro(a)suse.de + +- fix arch.h to be usable on s390 additional to s390x + +------------------------------------------------------------------ +Tue Feb 11 14:13:09 CET 2014 - pth(a)suse.de + +- Add and adapt patches from Mellanox that add XRC support + (bnc#858729): + + libibverbs-Add_ibv_open_qp_for_XRC_receive_QPs.patch + libibverbs-Add_support_for_XRC_QPs.patch + libibverbs-Add_support_for_XRC_SRQs.patch + libibverbs-Add_XRC_sample_application.patch + libibverbs-Fix_XRC_sample_application_ibv_xsrq_pingpong_issues.patch + libibverbs-Infrastructure_to_support_verbs_extensions.patch + libibverbs-Introduce_XRC_domains_XRCDs.patch + libibverbs-Use-IBV_SEND_INLINE-in-example-pingpong-programs.patch + libibverbs-XRC_man_pages.patch + +------------------------------------------------------------------- +Tue Feb 11 13:48:00 CET 2014 - pth(a)suse.de + +- Fix source URI. + +------------------------------------------------------------------- +Mon Feb 10 22:11:03 CET 2014 - pth(a)suse.de + +- Fix baselibs.conf. + +------------------------------------------------------------------- +Mon Feb 3 14:56:20 CET 2014 - pth(a)suse.de + +- Readd baselibs.conf. + +------------------------------------------------------------------- +Thu Jan 30 18:08:20 CET 2014 - pth(a)suse.de + +- License is GPL-2.0 or BSD-2-Clause +- Add COPYING to package documentation. + +------------------------------------------------------------------- +Fri Jan 17 17:54:30 CET 2014 - pth(a)suse.de + +- Update to 1.1.7 from OFED 3.12 +- Add libibverbs-s390.patch for s390 support. + +------------------------------------------------------------------- +Mon Aug 12 12:13:52 UTC 2013 - kleinrob(a)mpip-mainz.mpg.de + +- Re-added accidentlly removed ntohl() in examples/pingping.c. + +------------------------------------------------------------------- +Tue Sep 18 12:21:59 CEST 2012 - pth(a)suse.de + +- Simplify spec file a bit by using a define for the library name. + +------------------------------------------------------------------- +Fri Aug 31 19:15:16 CEST 2012 - pth(a)suse.de + +- update to 1.1.4-1.24.gb89d4d7 from OFED 1.5.4.1. +- Rename configure.patch to libibverbs-no_silent_rules.patch. +- Pass V=1 to make in case silent rules were added. + +------------------------------------------------------------------- +Sun Aug 26 19:27:18 UTC 2012 - jengelh(a)inai.de + +- Remove redundant tags/sections from specfile +- Kill configure.patch: absence of AM_SILENT_RULES is no problem +- Redo libibverbs-fix_aliasing.patch with proper approach +- Parallel build with %_smp_mflags + +------------------------------------------------------------------- +Thu Jun 28 13:58:06 CEST 2012 - pth(a)suse.de + +- Fix aliasing issue in example program. + +------------------------------------------------------------------- +Tue May 8 18:07:36 CEST 2012 - pth(a)suse.de + +- BuildRequire automake, autoconf and libtool. + +------------------------------------------------------------------- +Wed Dec 15 15:37:47 CET 2010 - pth(a)suse.de + +- Add a runtime package with tools and their man pages. +- Split off the dynamic library into its own versioned sub package. +- Split off the static library into its own sub package. +- Clean up the spec file. + +------------------------------------------------------------------- +Thu Oct 21 16:18:23 UTC 2010 - stefan.fent(a)novell.com + +- update to v1.1.4-0.14.gb6c138b for OFED 1.5.2 + +------------------------------------------------------------------- +Sun May 23 20:48:20 CEST 2010 - jjolly(a)novell.com + +- Same tarball, different name. Leaving the postfix + -0.6.g932f1a2 on the tarball to identify it for future updates + +------------------------------------------------------------------- +Sun May 23 18:48:55 CEST 2010 - jjolly(a)novell.com + +- Updated to v1.1.3 from OFED 1.5.1 + +------------------------------------------------------------------- +Sat Jul 11 02:34:52 CEST 2009 - jjolly(a)suse.de + +- Updated to v1.1.2 from OFED 1.4.1 release + +------------------------------------------------------------------- +Wed Oct 15 21:49:34 CEST 2008 - jjolly(a)suse.de + +- Updated to release from OFED 1.3.1 + +------------------------------------------------------------------- +Thu Feb 28 19:10:47 CET 2008 - jjolly(a)suse.de + +- Updated to release from OFED 1.3 GA +- Added man7 to devel files list + +------------------------------------------------------------------- +Tue Jan 29 15:18:53 CET 2008 - jjolly(a)suse.de + +- Updated to release from OFED 1.3 rc2 + +------------------------------------------------------------------- +Wed Jun 20 11:58:35 CEST 2007 - hvogel(a)suse.de + +- Initial Package, Version 1.1.1 ++++ 1 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.libibverbs.new/libibverbs.changes New: ---- baselibs.conf ibdev2netdev libibverbs-1.1.4-fix-deleted-ntohl.patch libibverbs-1.1.7.tar.gz libibverbs-Add-ibv_port_cap_flags.patch libibverbs-Add-ibv_query_port_ex-support.patch libibverbs-Add-receive-flow-steering-support.patch libibverbs-Use-neighbour-lookup-for-RoCE-UD-QPs-Eth-L2-resoluti.patch libibverbs-autotools.patch libibverbs-fix_aliasing.patch libibverbs-s390.patch libibverbs.changes libibverbs.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libibverbs.spec ++++++ # # spec file for package libibverbs (Version 1.1.4) # # Copyright (c) 2010-2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libibverbs Summary: Infiniband verbs library Version: 1.1.7 Release: 1 License: GPL-2.0 or BSD-2-Clause Group: System/Libraries # For the time being no source URL as the tarball available there differs Source0: %{name}-%{version}.tar.gz Source1: ibdev2netdev Source2: baselibs.conf # Patch1: libibverbs-fix_aliasing.patch Patch2: libibverbs-1.1.4-fix-deleted-ntohl.patch Patch3: libibverbs-s390.patch Patch6: libibverbs-Add-ibv_port_cap_flags.patch Patch7: libibverbs-Use-neighbour-lookup-for-RoCE-UD-QPs-Eth-L2-resoluti.patch Patch8: libibverbs-Add-ibv_query_port_ex-support.patch Patch9: libibverbs-Add-receive-flow-steering-support.patch Patch10: libibverbs-autotools.patch # BuildRequires: automake autoconf libtool BuildRequires: pkg-config BuildRequires: libnl3-devel URL: http://www.openfabrics.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define so_major 1 %define lname %{name}%{so_major} %description libibverbs is a library that allows userspace processes to use InfiniBand "verbs" as described in the InfiniBand Architecture Specification. This includes direct hardware access for fast path operations. %package -n %{lname} Summary: Infiniband verbs library Group: System/Libraries %description -n %{lname} libibverbs is a library that allows userspace processes to use InfiniBand "verbs" as described in the InfiniBand Architecture Specification. This includes direct hardware access for fast path operations. This package contains the runtime library. %package runtime Group: Productivity/Networking/System Summary: Tools for the Infiniband Verbs library and manpages %description runtime This package contains the Infiniband verbs tools and their man pages. %package devel Group: Development/Libraries/C and C++ Summary: Development files for the libibverbs library Requires: %{name}-runtime = %{version} %description devel Static libraries and header files for the Infiniband verbs library. %prep %setup -q %patch1 %patch2 -p1 %patch3 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 %build autoreconf -fi %configure --disable-silent-rules --disable-static make %{?_smp_mflags} %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig %install make DESTDIR=%{buildroot} install mkdir -p %{buildroot}/%_sysconfdir/libibverbs.d install -m 755 %{S:1} %{buildroot}%{_bindir} rm -f %{buildroot}%_libdir/libibverbs.la %files runtime %defattr(-, root, root) %doc COPYING %_sysconfdir/libibverbs.d %_bindir/* %_mandir/man1/* %files -n %{lname} %defattr(-, root, root) %_libdir/libibverbs.so.* %files devel %defattr(-,root,root) %_includedir/infiniband %_libdir/libibverbs.so %_mandir/man3/* %changelog ++++++ baselibs.conf ++++++ libibverbs1 libibverbs-devel ++++++ ibdev2netdev ++++++ #! /bin/bash usage() { echo "$(basename $0) <options>" echo "-h, --help print help message" echo "-v, --verbose print more info" } case $1 in "-h" | "--help") usage exit 0 ;; esac if (( $# > 1 )); then usage exit -1 fi if (( $# == 1 )) && [ "$1" != "-v" ]; then usage exit -1 fi ibdevs=$(ls /sys/class/infiniband/) devs=$(ls /sys/class/net/ | grep ^[ei]) if [ "x$devs" == "x" ]; then # no relevant devices - quit immediately exit fi for d in $devs; do if [ -f /sys/class/net/$d/dev_id ]; then oldstyle=n break fi done if [ "x$oldstyle" == "xn" ]; then for d in $ibdevs; do ibrsc=$(cat /sys/class/infiniband/$d/device/resource) eths=$(ls /sys/class/net/) for eth in $eths; do if [ -f /sys/class/net/$eth/device/resource ]; then ethrsc=$(cat /sys/class/net/$eth/device/resource) if [ "x$ethrsc" == "x$ibrsc" ]; then if [ -f /sys/class/net/$eth/dev_id ]; then port=$(cat /sys/class/net/$eth/dev_id) port=$(printf "%d" $port) port=$(( port + 1 )) if [ "$1" == "-v" ]; then ibstate=$(printf "%-6s" $(cat /sys/class/infiniband/$d/ports/$port/state | gawk '{print $2}')) devid=$(printf "MT%d" $(cat /sys/class/infiniband/$d/device/device)) fwver=$(cat /sys/class/infiniband/$d/fw_ver) tmp=$IFS IFS=":" devdesc=$(printf "%-15s" $(strings /sys/class/infiniband/$d/device/vpd | head -1)) partid=$(printf "%-11s" $(strings /sys/class/infiniband/$d/device/vpd | head -4 | tail -1 | gawk '{print $1}')) IFS=$tmp fi if [ -f /sys/class/net/$eth/carrier ]; then link_state=$(cat /sys/class/net/$eth/carrier 2> /dev/null) if (( link_state == 1 )); then link_state="Up" else link_state="Down" fi else link_state="NA" fi if [ "$1" == "-v" ]; then echo "$d ($devid - $partid) $devdesc fw $fwver port $port ($ibstate) ==> $eth ($link_state)" else echo "$d port $port ==> $eth ($link_state)" fi fi fi fi done done else ########################## ### old style ########################## function print_line() { echo "$1 port $2 <===> $3" } function find_guid() { ibdevs=$(ls /sys/class/infiniband/) for ibdev in $ibdevs; do ports=$(ls /sys/class/infiniband/$ibdev/ports/) for port in $ports; do gids=$(ls /sys/class/infiniband/$ibdev/ports/$port/gids) for gid in $gids; do pguid=$(cat /sys/class/infiniband/$ibdev/ports/$port/gids/$gid | cut -b 21- | sed -e 's/://g') if [ x$pguid == x$1 ]; then print_line $ibdev $port $2 fi done done done } function find_mac() { ibdevs=$(ls /sys/class/infiniband/) for ibdev in $ibdevs; do type=$(cat /sys/class/infiniband/$ibdev/node_type|cut -d ' ' -f 2) ports=$(ls /sys/class/infiniband/$ibdev/ports/) for port in $ports; do gids=$(ls /sys/class/infiniband/$ibdev/ports/$port/gids) for gid in $gids; do if [[ "$type" = "RNIC" ]]; then pmac=$(cat /sys/class/infiniband/$ibdev/ports/$port/gids/$gid | cut -b 1-14|sed -e 's/://g') else first=$(cat /sys/class/infiniband/$ibdev/ports/$port/gids/$gid | cut -b 21-22) first=$(( first ^ 2 )) first=$(printf "%02x" $first) second=$(cat /sys/class/infiniband/$ibdev/ports/$port/gids/$gid | cut -b 21- | sed -e 's/://g' | cut -b 3-6) third=$(cat /sys/class/infiniband/$ibdev/ports/$port/gids/$gid | cut -b 21- | sed -e 's/://g' | cut -b 11-) pmac=$first$second$third fi if [ x$pmac == x$1 ]; then print_line $ibdev $port $2 fi done done done } ifcs=$(ifconfig -a | egrep '^eth|^ib' | gawk '{print $1}') for ifc in $ifcs; do len=$(cat /sys/class/net/$ifc/addr_len) if (( len == 20 )); then guid=$(cat /sys/class/net/$ifc/address | cut -b 37- | sed -e 's/://g') find_guid $guid $ifc elif (( len == 6)); then mac=$(cat /sys/class/net/$ifc/address | sed -e 's/://g') find_mac $mac $ifc fi done fi ++++++ libibverbs-1.1.4-fix-deleted-ntohl.patch ++++++ Name: Robert Klein <kleinrob(a)mpip-mainz.mpg.de> Date: 2012-08-12 12:00:00 +0200 Subject: add accidentally removed ntohl Jan Engelhardts strict-aliasing patch accidentally removed an ntohl. this patch reintroduces it. --- --- examples/pingpong.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: libibverbs-1.1.7/examples/pingpong.c =================================================================== --- libibverbs-1.1.7.orig/examples/pingpong.c 2014-01-17 18:40:47.915091677 +0100 +++ libibverbs-1.1.7/examples/pingpong.c 2014-01-17 18:44:07.357475561 +0100 @@ -72,9 +72,9 @@ void wire_gid_to_gid(const char *wgid, u for (tmp[8] = 0, i = 0; i < 4; ++i) { memcpy(tmp, wgid + i * 8, 8); - sscanf(tmp, "%x", &v32); - v32n = ntohl(v32); - memcpy(&gid->raw[i*4], &v32n, sizeof(v32n)); + sscanf(tmp, "%x", &v32n); + v32 = ntohl(v32n); + memcpy(&gid->raw[i*4], &v32, sizeof(v32)); } } ++++++ libibverbs-Add-ibv_port_cap_flags.patch ++++++ >From 26de70dc2ff34a66a5c6785d29ffbdbd71ad7287 Mon Sep 17 00:00:00 2001 From: Matan Barak <matanb(a)mellanox.com> Date: Wed, 29 Jan 2014 11:55:15 +0200 Subject: [PATCH 3/6] Add ibv_port_cap_flags Add an enum that describes ibv_port_cap_flags that complies with the respective kernel enum. This value could be fetched when using ibv_query_port in port_cap_flags. Signed-off-by: Matan Barak <matanb(a)mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz(a)mellanox.com> --- include/infiniband/verbs.h | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h index 3696495..18c4dd5 100644 --- a/include/infiniband/verbs.h +++ b/include/infiniband/verbs.h @@ -190,6 +190,28 @@ enum { IBV_LINK_LAYER_ETHERNET, }; +enum ibv_port_cap_flags { + IBV_PORT_SM = 1 << 1, + IBV_PORT_NOTICE_SUP = 1 << 2, + IBV_PORT_TRAP_SUP = 1 << 3, + IBV_PORT_OPT_IPD_SUP = 1 << 4, + IBV_PORT_AUTO_MIGR_SUP = 1 << 5, + IBV_PORT_SL_MAP_SUP = 1 << 6, + IBV_PORT_MKEY_NVRAM = 1 << 7, + IBV_PORT_PKEY_NVRAM = 1 << 8, + IBV_PORT_LED_INFO_SUP = 1 << 9, + IBV_PORT_SYS_IMAGE_GUID_SUP = 1 << 11, + IBV_PORT_PKEY_SW_EXT_PORT_TRAP_SUP = 1 << 12, + IBV_PORT_EXTENDED_SPEEDS_SUP = 1 << 14, + IBV_PORT_CM_SUP = 1 << 16, + IBV_PORT_SNMP_TUNNEL_SUP = 1 << 17, + IBV_PORT_REINIT_SUP = 1 << 18, + IBV_PORT_DEVICE_MGMT_SUP = 1 << 19, + IBV_PORT_VENDOR_CLASS = 1 << 24, + IBV_PORT_CLIENT_REG_SUP = 1 << 25, + IBV_PORT_IP_BASED_GIDS = 1 << 26, +}; + struct ibv_port_attr { enum ibv_port_state state; enum ibv_mtu max_mtu; -- 1.7.8.2 ++++++ libibverbs-Add-ibv_query_port_ex-support.patch ++++++ >From 2f314d77bcf0d6cd0922f908bf077f05c906a83d Mon Sep 17 00:00:00 2001 From: Matan Barak <matanb(a)mellanox.com> Date: Thu, 16 Jan 2014 19:09:18 +0200 Subject: [PATCH 5/6] Add ibv_query_port_ex support This patch adds extended support for ibv_query_port. This allows to request fields that aren't availible by the current ibv_query_port API and avoid fetching from vendor library fields that the user doesn't need, which gives more room for optimizations. Signed-off-by: Matan Barak <matanb(a)mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz(a)mellanox.com> --- include/infiniband/verbs.h | 102 ++++++++++++++++++++++++++++++++++++++++++++ src/device.c | 2 + src/verbs.c | 7 ++- 3 files changed, 109 insertions(+), 2 deletions(-) diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h index 5eac403..97898a0 100644 --- a/include/infiniband/verbs.h +++ b/include/infiniband/verbs.h @@ -491,6 +491,69 @@ struct ibv_ah_attr_ex { uint16_t vid; }; +enum { + IBV_QUERY_PORT_EX_STATE = 1 << 0, + IBV_QUERY_PORT_EX_MAX_MTU = 1 << 1, + IBV_QUERY_PORT_EX_ACTIVE_MTU = 1 << 2, + IBV_QUERY_PORT_EX_GID_TBL_LEN = 1 << 3, + IBV_QUERY_PORT_EX_CAP_FLAGS = 1 << 4, + IBV_QUERY_PORT_EX_MAX_MSG_SZ = 1 << 5, + IBV_QUERY_PORT_EX_BAD_PKEY_CNTR = 1 << 6, + IBV_QUERY_PORT_EX_QKEY_VIOL_CNTR = 1 << 7, + IBV_QUERY_PORT_EX_PKEY_TBL_LEN = 1 << 8, + IBV_QUERY_PORT_EX_LID = 1 << 9, + IBV_QUERY_PORT_EX_SM_LID = 1 << 10, + IBV_QUERY_PORT_EX_LMC = 1 << 11, + IBV_QUERY_PORT_EX_MAX_VL_NUM = 1 << 12, + IBV_QUERY_PORT_EX_SM_SL = 1 << 13, + IBV_QUERY_PORT_EX_SUBNET_TIMEOUT = 1 << 14, + IBV_QUERY_PORT_EX_INIT_TYPE_REPLY = 1 << 15, + IBV_QUERY_PORT_EX_ACTIVE_WIDTH = 1 << 16, + IBV_QUERY_PORT_EX_ACTIVE_SPEED = 1 << 17, + IBV_QUERY_PORT_EX_PHYS_STATE = 1 << 18, + IBV_QUERY_PORT_EX_LINK_LAYER = 1 << 19, + /* mask of the fields that exists in the standard query_port_command */ + IBV_QUERY_PORT_EX_STD_MASK = (1 << 20) - 1, + /* mask of all supported fields */ + IBV_QUERY_PORT_EX_MASK = IBV_QUERY_PORT_EX_STD_MASK, +}; + +enum ibv_query_port_ex_attr_mask { + IBV_QUERY_PORT_EX_ATTR_MASK1 = 1 << 0, + IBV_QUERY_PORT_EX_ATTR_MASKS = (1 << 1) - 1 +}; + +struct ibv_port_attr_ex { + union { + struct { + enum ibv_port_state state; + enum ibv_mtu max_mtu; + enum ibv_mtu active_mtu; + int gid_tbl_len; + uint32_t port_cap_flags; + uint32_t max_msg_sz; + uint32_t bad_pkey_cntr; + uint32_t qkey_viol_cntr; + uint16_t pkey_tbl_len; + uint16_t lid; + uint16_t sm_lid; + uint8_t lmc; + uint8_t max_vl_num; + uint8_t sm_sl; + uint8_t subnet_timeout; + uint8_t init_type_reply; + uint8_t active_width; + uint8_t active_speed; + uint8_t phys_state; + uint8_t link_layer; + uint8_t reserved; + }; + struct ibv_port_attr port_attr; + }; + uint32_t comp_mask; + uint32_t mask1; +}; + enum ibv_srq_attr_mask { IBV_SRQ_MAX_WR = 1 << 0, @@ -904,6 +967,10 @@ enum verbs_context_mask { struct verbs_context { /* "grows up" - new fields go here */ + int (*drv_query_port_ex)(struct ibv_context *context, uint8_t port_num, + struct ibv_port_attr_ex *port_attr); + int (*lib_query_port_ex)(struct ibv_context *context, uint8_t port_num, + struct ibv_port_attr_ex *port_attr); struct ibv_ah * (*drv_ibv_create_ah_ex)(struct ibv_pd *pd, struct ibv_ah_attr_ex *attr); struct ibv_qp *(*open_qp)(struct ibv_context *context, @@ -1032,6 +1099,41 @@ static inline int ___ibv_query_port(struct ibv_context *context, #define ibv_query_port(context, port_num, port_attr) \ ___ibv_query_port(context, port_num, port_attr) +static inline int ibv_query_port_ex(struct ibv_context *context, + uint8_t port_num, + struct ibv_port_attr_ex *port_attr) +{ + struct verbs_context *vctx; + + if (0 == port_attr->comp_mask) + return ibv_query_port(context, port_num, + &port_attr->port_attr); + + /* Check that only valid flags were given */ + if ((!port_attr->comp_mask & IBV_QUERY_PORT_EX_ATTR_MASK1) || + (port_attr->comp_mask & ~IBV_QUERY_PORT_EX_ATTR_MASKS) || + (port_attr->mask1 & ~IBV_QUERY_PORT_EX_MASK)) { + errno = EINVAL; + return -errno; + } + + vctx = verbs_get_ctx_op(context, lib_query_port_ex); + + if (!vctx) { + /* Fallback to legacy mode */ + if (port_attr->comp_mask == IBV_QUERY_PORT_EX_ATTR_MASK1 && + !(port_attr->mask1 & ~IBV_QUERY_PORT_EX_STD_MASK)) + return ibv_query_port(context, port_num, + &port_attr->port_attr); + + /* Unsupported field was requested */ + errno = ENOSYS; + return -errno; + } + + return vctx->lib_query_port_ex(context, port_num, port_attr); +} + /** * ibv_query_gid - Get a GID table entry */ diff --git a/src/device.c b/src/device.c index beb7b3c..29ad726 100644 --- a/src/device.c +++ b/src/device.c @@ -169,6 +169,8 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device) * context_ex->lib_new_func1 = __verbs_new_func1; * context_ex->lib_new_func2 = __verbs_new_func2; */ + context_ex->lib_query_port_ex = + context_ex->drv_query_port_ex; } context->device = device; diff --git a/src/verbs.c b/src/verbs.c index e7343a9..f8245b0 100644 --- a/src/verbs.c +++ b/src/verbs.c @@ -550,7 +550,7 @@ struct ibv_ah *__ibv_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr) int err; struct ibv_ah *ah = NULL; #ifndef NRESOLVE_NEIGH - struct ibv_port_attr port_attr; + struct ibv_port_attr_ex port_attr; int dst_family; int src_family; int oif; @@ -570,7 +570,10 @@ struct ibv_ah *__ibv_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr) goto return_ah; } - err = ibv_query_port(pd->context, attr->port_num, &port_attr); + port_attr.comp_mask = IBV_QUERY_PORT_EX_ATTR_MASK1; + port_attr.mask1 = IBV_QUERY_PORT_EX_LINK_LAYER | + IBV_QUERY_PORT_EX_CAP_FLAGS; + err = ibv_query_port_ex(pd->context, attr->port_num, &port_attr); if (err) { fprintf(stderr, PFX "ibv_create_ah failed to query port.\n"); -- 1.7.8.2 ++++++ libibverbs-Add-receive-flow-steering-support.patch ++++++ >From db47da4a0b79fb3c20a744db2f70ab6b32c8a7eb Mon Sep 17 00:00:00 2001 From: Matan Barak <matanb(a)mellanox.com> Date: Thu, 6 Feb 2014 14:20:33 +0200 Subject: [PATCH 6/6] Add receive flow steering support The RDMA stack allows for applications to create IB_QPT_RAW_PACKET QPs, which receive plain Ethernet packets, specifically packets that don't carry any QPN to be matched by the receiving side. Applications using these QPs must be provided with a method to program some steering rule with the HW so packets arriving at the local port can be routed to them. In a similar manner, when the device supports flow streeing, IB UD QPs created by IPoIB allow user-space applications to steer specific TCP/IP flows to their QPs. This patch adds ibv_create_flow(), which allow providing a flow specification for a QP. When there's a match between the specification and a received packet, the packet is forwarded to that QP, in a the same way one uses ibv_attach_mcast() for IB UD multicast handling. Flow specifications are provided as instances of struct ibv_flow_spec_yyy, which describes L2, L3 and L4 headers. Currently specs for Ethernet, IPv4, TCP and UDP are defined. Flow specs are made of values and masks. The input to ib_create_flow() is a struct ib_flow_attr, which contains a few mandatory control elements and optional flow specs. struct ibv_flow_attr { uint32_t comp_mask; enum ibv_flow_attr_type type; uint16_t size; uint16_t priority; uint8_t num_of_specs; uint8_t port; uint32_t flags; /* Following are the optional layers according to user request * struct ibv_flow_spec_xxx [L2] * struct ibv_flow_spec_yyy [L3/L4] */ }; These flow specs are defined and used in a way which allows adding new spec types without kernel/user ABI change, just with a little API enhancement which defines the newly added spec. The flow spec structures are defined with TLV (Type-Length-Value) entries, which allows calling ib_create_flow() with a list of variable length of optional specs. For the actual processing of ibv_flow_attr the kernel uses the number of specs and the size mandatory fields along with the TLV nature of the specs. The returned value from ibv_create_flow() is a struct ibv_flow, which contains a handle provided by the kernel to be used when calling ibv_destroy_flow(). The ib_flow_attr enum type supports usage of flow steering for promiscuous and sniffer purposes: IBV_FLOW_ATTR_NORMAL - "regular" rule, steering according to rule specification IBV_FLOW_ATTR_ALL_DEFAULT - default unicast and multicast rule, receive all Ethernet traffic which isn't steered to any QP IBV_FLOW_ATTR_MC_DEFAULT - same as IB_FLOW_ATTR_ALL_DEFAULT but only for multicast ALL_DEFAULT and MC_DEFAULT rules options are valid only for Ethernet link type. Signed-off-by: Hadar Hen Zion <hadarh(a)mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz(a)mellanox.com> Signed-off-by: Matan Barak <matanb(a)mellanox.com> --- include/infiniband/driver.h | 4 + include/infiniband/kern-abi.h | 99 ++++++++++++++++++++++++++++++++ include/infiniband/verbs.h | 128 +++++++++++++++++++++++++++++++++++++++++- src/cmd.c | 105 ++++++++++++++++++++++++++++++++++ src/device.c | 4 + src/libibverbs.map | 2 6 files changed, 340 insertions(+), 2 deletions(-) Index: libibverbs-1.1.7/include/infiniband/driver.h =================================================================== --- libibverbs-1.1.7.orig/include/infiniband/driver.h 2014-03-05 10:36:36.000000000 +0100 +++ libibverbs-1.1.7/include/infiniband/driver.h 2014-03-31 18:49:19.376994127 +0200 @@ -194,6 +194,10 @@ int ibv_cmd_destroy_ah(struct ibv_ah *ah int ibv_cmd_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid); int ibv_cmd_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid); +struct ibv_flow *ibv_cmd_create_flow(struct ibv_qp *qp, + struct ibv_flow_attr *flow_attr); +int ibv_cmd_destroy_flow(struct ibv_flow *flow_id); + int ibv_dontfork_range(void *base, size_t size); int ibv_dofork_range(void *base, size_t size); Index: libibverbs-1.1.7/include/infiniband/kern-abi.h =================================================================== --- libibverbs-1.1.7.orig/include/infiniband/kern-abi.h 2014-03-31 18:49:19.331995166 +0200 +++ libibverbs-1.1.7/include/infiniband/kern-abi.h 2014-03-31 18:50:51.914859071 +0200 @@ -103,6 +103,13 @@ enum { #define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80ul +enum { + IB_USER_VERBS_CMD_CREATE_FLOW = (IB_USER_VERBS_CMD_FLAG_EXTENDED << + IB_USER_VERBS_CMD_FLAGS_SHIFT) + + IB_USER_VERBS_CMD_THRESHOLD, + IB_USER_VERBS_CMD_DESTROY_FLOW +}; + /* * Make sure that all structs defined in this file remain laid out so * that they pack the same way on 32-bit and 64-bit architectures (to @@ -677,6 +684,76 @@ struct ibv_kern_send_wr { } qp_type; }; +struct ibv_kern_eth_filter { + __u8 dst_mac[6]; + __u8 src_mac[6]; + __u16 ether_type; + __u16 vlan_tag; +}; + +struct ibv_kern_spec_eth { + __u32 type; + __u16 size; + __u16 reserved; + struct ibv_kern_eth_filter val; + struct ibv_kern_eth_filter mask; +}; + +struct ibv_kern_ipv4_filter { + __u32 src_ip; + __u32 dst_ip; +}; + +struct ibv_kern_spec_ipv4 { + __u32 type; + __u16 size; + __u16 reserved; + struct ibv_kern_ipv4_filter val; + struct ibv_kern_ipv4_filter mask; +}; + +struct ibv_kern_tcp_udp_filter { + __u16 dst_port; + __u16 src_port; +}; + +struct ibv_kern_spec_tcp_udp { + __u32 type; + __u16 size; + __u16 reserved; + struct ibv_kern_tcp_udp_filter val; + struct ibv_kern_tcp_udp_filter mask; +}; + + +struct ibv_kern_spec { + union { + struct { + __u32 type; + __u16 size; + __u16 reserved; + } hdr; + struct ibv_kern_spec_eth eth; + struct ibv_kern_spec_ipv4 ipv4; + struct ibv_kern_spec_tcp_udp tcp_udp; + }; + +}; + +struct ibv_kern_flow_attr { + __u32 type; + __u16 size; + __u16 priority; + __u8 num_of_specs; + __u8 reserved[2]; + __u8 port; + __u32 flags; + /* Following are the optional layers according to user request + * struct ibv_kern_flow_spec_xxx + * struct ibv_kern_flow_spec_yyy + */ +}; + struct ibv_post_send { __u32 command; __u16 in_words; @@ -764,6 +841,24 @@ struct ibv_attach_mcast { __u64 driver_data[0]; }; +struct ibv_create_flow { + struct ex_hdr hdr; + __u32 comp_mask; + __u32 qp_handle; + struct ibv_kern_flow_attr flow_attr; +}; + +struct ibv_create_flow_resp { + __u32 comp_mask; + __u32 flow_handle; +}; + +struct ibv_destroy_flow { + struct ex_hdr hdr; + __u32 comp_mask; + __u32 flow_handle; +}; + struct ibv_detach_mcast { __u32 command; __u16 in_words; @@ -906,7 +1001,9 @@ enum { IB_USER_VERBS_CMD_CLOSE_XRCD_V2 = -1, IB_USER_VERBS_CMD_CREATE_XSRQ_V2 = -1, IB_USER_VERBS_CMD_OPEN_QP_V2 = -1, - IB_USER_VERBS_CMD_KWRITE_MMIO_V2 = -1 + IB_USER_VERBS_CMD_KWRITE_MMIO_V2 = -1, + IB_USER_VERBS_CMD_CREATE_FLOW_V2 = -1, + IB_USER_VERBS_CMD_DESTROY_FLOW_V2 = -1 }; struct ibv_modify_srq_v3 { Index: libibverbs-1.1.7/include/infiniband/verbs.h =================================================================== --- libibverbs-1.1.7.orig/include/infiniband/verbs.h 2014-03-31 18:49:19.367994335 +0200 +++ libibverbs-1.1.7/include/infiniband/verbs.h 2014-03-31 18:49:19.377994104 +0200 @@ -115,7 +115,8 @@ enum ibv_device_cap_flags { IBV_DEVICE_RC_RNR_NAK_GEN = 1 << 12, IBV_DEVICE_SRQ_RESIZE = 1 << 13, IBV_DEVICE_N_NOTIFY_CQ = 1 << 14, - IBV_DEVICE_XRC = 1 << 20 + IBV_DEVICE_XRC = 1 << 20, + IBV_DEVICE_MANAGED_FLOW_STEERING = 1 << 29 }; enum ibv_atomic_cap { @@ -965,8 +966,113 @@ enum verbs_context_mask { VERBS_CONTEXT_RESERVED = 1 << 4 }; +enum ibv_flow_flags { + IBV_FLOW_ATTR_FLAGS_ALLOW_LOOP_BACK = 1, +}; + +enum ibv_flow_attr_type { + /* steering according to rule specifications */ + IBV_FLOW_ATTR_NORMAL = 0x0, + /* default unicast and multicast rule - + * receive all Eth traffic which isn't steered to any QP + */ + IBV_FLOW_ATTR_ALL_DEFAULT = 0x1, + /* default multicast rule - + * receive all Eth multicast traffic which isn't steered to any QP + */ + IBV_FLOW_ATTR_MC_DEFAULT = 0x2, +}; + +enum ibv_flow_spec_type { + IBV_FLOW_SPEC_ETH = 0x20, + IBV_FLOW_SPEC_IPV4 = 0x30, + IBV_FLOW_SPEC_TCP = 0x40, + IBV_FLOW_SPEC_UDP = 0x41, +}; + +struct ibv_flow_eth_filter { + uint8_t dst_mac[6]; + uint8_t src_mac[6]; + uint16_t ether_type; + /* + * same layout as 802.1q: prio 3, cfi 1, vlan id 12 + */ + uint16_t vlan_tag; +}; + +struct ibv_flow_spec_eth { + enum ibv_flow_spec_type type; + uint16_t size; + struct ibv_flow_eth_filter val; + struct ibv_flow_eth_filter mask; +}; + +struct ibv_flow_ipv4_filter { + uint32_t src_ip; + uint32_t dst_ip; +}; + +struct ibv_flow_spec_ipv4 { + enum ibv_flow_spec_type type; + uint16_t size; + struct ibv_flow_ipv4_filter val; + struct ibv_flow_ipv4_filter mask; +}; + +struct ibv_flow_tcp_udp_filter { + uint16_t dst_port; + uint16_t src_port; +}; + +struct ibv_flow_spec_tcp_udp { + enum ibv_flow_spec_type type; + uint16_t size; + struct ibv_flow_tcp_udp_filter val; + struct ibv_flow_tcp_udp_filter mask; +}; + +struct ibv_flow_spec { + union { + struct { + enum ibv_flow_spec_type type; + uint16_t size; + } hdr; + struct ibv_flow_spec_eth eth; + struct ibv_flow_spec_ipv4 ipv4; + struct ibv_flow_spec_tcp_udp tcp_udp; + }; +}; + +struct ibv_flow_attr { + uint32_t comp_mask; + enum ibv_flow_attr_type type; + uint16_t size; + uint16_t priority; + uint8_t num_of_specs; + uint8_t port; + uint32_t flags; + /* Following are the optional layers according to user request + * struct ibv_flow_spec_xxx [L2] + * struct ibv_flow_spec_yyy [L3/L4] + */ +}; + +struct ibv_flow { + uint32_t comp_mask; + struct ibv_context *context; + uint32_t handle; +}; + struct verbs_context { /* "grows up" - new fields go here */ + int (*drv_ibv_destroy_flow) (struct ibv_flow *flow); + int (*lib_ibv_destroy_flow) (struct ibv_flow *flow); + struct ibv_flow * (*drv_ibv_create_flow) (struct ibv_qp *qp, + struct ibv_flow_attr + *flow_attr); + struct ibv_flow * (*lib_ibv_create_flow) (struct ibv_qp *qp, + struct ibv_flow_attr + *flow_attr); int (*drv_query_port_ex)(struct ibv_context *context, uint8_t port_num, struct ibv_port_attr_ex *port_attr); int (*lib_query_port_ex)(struct ibv_context *context, uint8_t port_num, @@ -1156,6 +1262,26 @@ struct ibv_pd *ibv_alloc_pd(struct ibv_c */ int ibv_dealloc_pd(struct ibv_pd *pd); +static inline struct ibv_flow *ibv_create_flow(struct ibv_qp *qp, + struct ibv_flow_attr *flow) +{ + struct verbs_context *vctx = verbs_get_ctx_op(qp->context, + lib_ibv_create_flow); + if (!vctx || !vctx->lib_ibv_create_flow) + return NULL; + + return vctx->lib_ibv_create_flow(qp, flow); +} + +static inline int ibv_destroy_flow(struct ibv_flow *flow_id) +{ + struct verbs_context *vctx = verbs_get_ctx_op(flow_id->context, + lib_ibv_destroy_flow); + if (!vctx || !vctx->lib_ibv_destroy_flow) + return -ENOSYS; + return vctx->lib_ibv_destroy_flow(flow_id); +} + /** * ibv_open_xrcd - Open an extended connection domain */ Index: libibverbs-1.1.7/src/cmd.c =================================================================== --- libibverbs-1.1.7.orig/src/cmd.c 2014-03-05 10:36:36.000000000 +0100 +++ libibverbs-1.1.7/src/cmd.c 2014-03-31 18:49:19.377994104 +0200 @@ -1268,3 +1268,108 @@ int ibv_cmd_detach_mcast(struct ibv_qp * return 0; } + +static int ib_spec_to_kern_spec(struct ibv_flow_spec *ib_spec, + struct ibv_kern_spec *kern_spec) +{ + kern_spec->hdr.type = ib_spec->hdr.type; + + switch (ib_spec->hdr.type) { + case IBV_FLOW_SPEC_ETH: + kern_spec->eth.size = sizeof(struct ibv_kern_spec_eth); + memcpy(&kern_spec->eth.val, &ib_spec->eth.val, + sizeof(struct ibv_flow_eth_filter)); + memcpy(&kern_spec->eth.mask, &ib_spec->eth.mask, + sizeof(struct ibv_flow_eth_filter)); + break; + case IBV_FLOW_SPEC_IPV4: + kern_spec->ipv4.size = sizeof(struct ibv_kern_spec_ipv4); + memcpy(&kern_spec->ipv4.val, &ib_spec->ipv4.val, + sizeof(struct ibv_flow_ipv4_filter)); + memcpy(&kern_spec->ipv4.mask, &ib_spec->ipv4.mask, + sizeof(struct ibv_flow_ipv4_filter)); + break; + case IBV_FLOW_SPEC_TCP: + case IBV_FLOW_SPEC_UDP: + kern_spec->tcp_udp.size = sizeof(struct ibv_kern_spec_tcp_udp); + memcpy(&kern_spec->tcp_udp.val, &ib_spec->tcp_udp.val, + sizeof(struct ibv_flow_ipv4_filter)); + memcpy(&kern_spec->tcp_udp.mask, &ib_spec->tcp_udp.mask, + sizeof(struct ibv_flow_tcp_udp_filter)); + break; + default: + return -EINVAL; + } + return 0; +} + +struct ibv_flow *ibv_cmd_create_flow(struct ibv_qp *qp, + struct ibv_flow_attr *flow_attr) +{ + struct ibv_create_flow *cmd; + struct ibv_create_flow_resp resp; + struct ibv_flow *flow_id; + size_t cmd_size; + size_t written_size; + int i, err; + void *kern_spec; + void *ib_spec; + + cmd_size = sizeof(*cmd) + (flow_attr->num_of_specs * + sizeof(struct ibv_kern_spec)); + cmd = alloca(cmd_size); + flow_id = malloc(sizeof(*flow_id)); + if (!flow_id) + return NULL; + memset(cmd, 0, cmd_size); + + cmd->qp_handle = qp->handle; + + cmd->flow_attr.type = flow_attr->type; + cmd->flow_attr.priority = flow_attr->priority; + cmd->flow_attr.num_of_specs = flow_attr->num_of_specs; + cmd->flow_attr.port = flow_attr->port; + cmd->flow_attr.flags = flow_attr->flags; + + kern_spec = cmd + 1; + ib_spec = flow_attr + 1; + for (i = 0; i < flow_attr->num_of_specs; i++) { + err = ib_spec_to_kern_spec(ib_spec, kern_spec); + if (err) + goto err; + cmd->flow_attr.size += + ((struct ibv_kern_spec *)kern_spec)->hdr.size; + kern_spec += ((struct ibv_kern_spec *)kern_spec)->hdr.size; + ib_spec += ((struct ibv_flow_spec *)ib_spec)->hdr.size; + } + + written_size = sizeof(*cmd) + cmd->flow_attr.size; + IBV_INIT_CMD_RESP_EX_VCMD(cmd, written_size, written_size, CREATE_FLOW, + &resp, sizeof(resp)); + if (write(qp->context->cmd_fd, cmd, written_size) != written_size) + goto err; + + VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof(resp)); + + flow_id->context = qp->context; + flow_id->handle = resp.flow_handle; + return flow_id; +err: + free(flow_id); + return NULL; +} + +int ibv_cmd_destroy_flow(struct ibv_flow *flow_id) +{ + struct ibv_destroy_flow cmd; + int ret = 0; + + memset(&cmd, 0, sizeof(cmd)); + IBV_INIT_CMD_EX(&cmd, sizeof(cmd), DESTROY_FLOW); + cmd.flow_handle = flow_id->handle; + + if (write(flow_id->context->cmd_fd, &cmd, sizeof(cmd)) != sizeof(cmd)) + ret = errno; + free(flow_id); + return ret; +} Index: libibverbs-1.1.7/src/device.c =================================================================== --- libibverbs-1.1.7.orig/src/device.c 2014-03-31 18:49:19.367994335 +0200 +++ libibverbs-1.1.7/src/device.c 2014-03-31 18:49:19.378994081 +0200 @@ -171,6 +171,10 @@ struct ibv_context *__ibv_open_device(st */ context_ex->lib_query_port_ex = context_ex->drv_query_port_ex; + context_ex->lib_ibv_create_flow = + context_ex->drv_ibv_create_flow; + context_ex->lib_ibv_destroy_flow = + context_ex->drv_ibv_destroy_flow; } context->device = device; Index: libibverbs-1.1.7/src/libibverbs.map =================================================================== --- libibverbs-1.1.7.orig/src/libibverbs.map 2014-03-05 10:36:36.000000000 +0100 +++ libibverbs-1.1.7/src/libibverbs.map 2014-03-31 18:49:19.378994081 +0200 @@ -64,6 +64,8 @@ IBVERBS_1.0 { ibv_cmd_destroy_ah; ibv_cmd_attach_mcast; ibv_cmd_detach_mcast; + ibv_cmd_create_flow; + ibv_cmd_destroy_flow; ibv_copy_qp_attr_from_kern; ibv_copy_path_rec_from_kern; ibv_copy_path_rec_to_kern; ++++++ libibverbs-Use-neighbour-lookup-for-RoCE-UD-QPs-Eth-L2-resoluti.patch ++++++ ++++ 1453 lines (skipped) ++++++ libibverbs-autotools.patch ++++++ --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) Index: configure.ac =================================================================== --- configure.ac.orig 2014-04-03 11:43:26.659194576 +0200 +++ configure.ac 2014-04-03 15:36:29.279084919 +0200 @@ -10,14 +10,15 @@ AM_INIT_AUTOMAKE([foreign subdir-objects m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Checks for programs -AC_PROG_CC -AC_USE_SYSTEM_EXTENSIONS -AC_PROG_LN_S -LT_INIT +AC_PROG_CC() +AC_USE_SYSTEM_EXTENSIONS() +AC_PROG_LN_S() +LT_INIT() + AC_ARG_WITH([valgrind], - AS_HELP_STRING([--with-valgrind], - [Enable Valgrind annotations (small runtime overhead, default NO)])) + [AS_HELP_STRING([--with-valgrind], + [Enable Valgrind annotations (small runtime overhead, default NO)])]) if test x$with_valgrind = x || test x$with_valgrind = xno; then want_valgrind=no AC_DEFINE([NVALGRIND], 1, [Define to 1 to disable Valgrind annotations.]) ++++++ libibverbs-fix_aliasing.patch ++++++ From: Jan Engelhardt <jengelh(a)inai.de> Date: 2012-08-26 21:34:11.356459793 +0200 src: fix breakage of alignment constraints and strict aliasing src/verbs.c: In function 'is_link_local_gid': src/verbs.c:689:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] src/verbs.c:690:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] examples/pingpong.c: In function 'wire_gid_to_gid': examples/pingpong.c:76:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] examples/pingpong.c: In function 'gid_to_wire_gid': examples/pingpong.c:85:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] --- examples/pingpong.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Index: examples/pingpong.c =================================================================== --- examples/pingpong.c.orig 2014-01-17 17:56:03.555235512 +0100 +++ examples/pingpong.c 2014-01-17 18:00:03.448680268 +0100 @@ -67,21 +67,24 @@ int pp_get_port_info(struct ibv_context void wire_gid_to_gid(const char *wgid, union ibv_gid *gid) { char tmp[9]; - uint32_t v32; + uint32_t v32, v32n; int i; for (tmp[8] = 0, i = 0; i < 4; ++i) { memcpy(tmp, wgid + i * 8, 8); sscanf(tmp, "%x", &v32); - *(uint32_t *)(&gid->raw[i * 4]) = ntohl(v32); + v32n = ntohl(v32); + memcpy(&gid->raw[i*4], &v32n, sizeof(v32n)); } } void gid_to_wire_gid(const union ibv_gid *gid, char wgid[]) { int i; + uint32_t v32; - for (i = 0; i < 4; ++i) - sprintf(&wgid[i * 8], "%08x", - htonl(*(uint32_t *)(gid->raw + i * 4))); + for (i = 0; i < 4; ++i) { + memcpy(&v32, gid->raw + i * 4, sizeof(v32)); + sprintf(&wgid[i * 8], "%08x", htonl(v32)); + } } ++++++ libibverbs-s390.patch ++++++ Cc: alexey_ishchuk(a)ru.ibm.com Subject: DAPL support for Linux on System z s390: Add DAPL support for Linux on System z in libibverbs Changes required to support the OFED stack on the System z platform. These changes include: * mb, rmb, wmb, and wc_wmb macro definitions for the System z platform; * new Infiniband verb command identifier. The new Infiniband verb command was added to allow data transfer from user space applications to infiniband devices on System z. --- include/infiniband/arch.h | 7 +++++++ include/infiniband/kern-abi.h | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) Index: libibverbs-1.1.7/include/infiniband/arch.h =================================================================== --- libibverbs-1.1.7.orig/include/infiniband/arch.h 2014-03-05 10:36:36.000000000 +0100 +++ libibverbs-1.1.7/include/infiniband/arch.h 2014-03-31 14:20:50.479614972 +0200 @@ -115,6 +115,13 @@ static inline uint64_t ntohll(uint64_t x #define wmb() mb() #define wc_wmb() wmb() +#elif defined(__s390x__) || defined(__s390__) + +#define mb() asm volatile("" ::: "memory") +#define rmb() mb() +#define wmb() mb() +#define wc_wmb() wmb() + #else #warning No architecture specific defines found. Using generic implementation. Index: libibverbs-1.1.7/include/infiniband/kern-abi.h =================================================================== --- libibverbs-1.1.7.orig/include/infiniband/kern-abi.h 2014-03-05 10:36:36.000000000 +0100 +++ libibverbs-1.1.7/include/infiniband/kern-abi.h 2014-03-31 14:20:50.480614949 +0200 @@ -91,7 +91,8 @@ enum { IB_USER_VERBS_CMD_OPEN_XRCD, IB_USER_VERBS_CMD_CLOSE_XRCD, IB_USER_VERBS_CMD_CREATE_XSRQ, - IB_USER_VERBS_CMD_OPEN_QP + IB_USER_VERBS_CMD_OPEN_QP, + IB_USER_VERBS_CMD_KWRITE_MMIO=52 }; #define IB_USER_VERBS_CMD_COMMAND_MASK 0xff @@ -904,7 +905,8 @@ enum { IB_USER_VERBS_CMD_OPEN_XRCD_V2 = -1, IB_USER_VERBS_CMD_CLOSE_XRCD_V2 = -1, IB_USER_VERBS_CMD_CREATE_XSRQ_V2 = -1, - IB_USER_VERBS_CMD_OPEN_QP_V2 = -1 + IB_USER_VERBS_CMD_OPEN_QP_V2 = -1, + IB_USER_VERBS_CMD_KWRITE_MMIO_V2 = -1 }; struct ibv_modify_srq_v3 { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpg2 for openSUSE:13.1:Update
by root＠hilbert.suse.de 03 Jul '14

03 Jul '14

Hello community, here is the log from the commit of package gpg2 for openSUSE:13.1:Update checked in at 2014-07-03 15:20:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/gpg2 (Old) and /work/SRC/openSUSE:13.1:Update/.gpg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpg2" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.6CNqU9/_old 2014-07-03 15:20:34.000000000 +0200 +++ /var/tmp/diff_new_pack.6CNqU9/_new 2014-07-03 15:20:34.000000000 +0200 @@ -1 +1 @@ -<link package='gpg2.2588' cicount='copy' /> +<link package='gpg2.2894' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpg2 for openSUSE:12.3:Update
by root＠hilbert.suse.de 03 Jul '14

03 Jul '14

Hello community, here is the log from the commit of package gpg2 for openSUSE:12.3:Update checked in at 2014-07-03 15:20:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/gpg2 (Old) and /work/SRC/openSUSE:12.3:Update/.gpg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpg2" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.1kD0eS/_old 2014-07-03 15:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.1kD0eS/_new 2014-07-03 15:20:32.000000000 +0200 @@ -1 +1 @@ -<link package='gpg2.2059' cicount='copy' /> +<link package='gpg2.2894' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.2893 for openSUSE:13.1:Update
by root＠hilbert.suse.de 03 Jul '14

03 Jul '14

Hello community, here is the log from the commit of package patchinfo.2893 for openSUSE:13.1:Update checked in at 2014-07-03 15:20:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.2893 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.2893.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.2893" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="798458" tracker="bnc">VUL-1: CVE-2013-0179: memcached: DoS when printing out keys to be deleted in verbose mode</issue> <issue id="858676" tracker="bnc">VUL-1: CVE-2013-7291: memcached: remote DoS (crash) via a request that triggers "unbounded key print"</issue> <issue id="858677" tracker="bnc">VUL-1: CVE-2013-7290: memcached: remote DoS (segmentation fault) via a request to delete a key</issue> <issue id="817781" tracker="bnc">VUL-1: memcached: CVE-2011-4971: remote DoS</issue> <issue id="857188" tracker="bnc">VUL-0: CVE-2013-7239: memcached: SASL authentication allows wrong credentials to access memcache</issue> <issue id="CVE-2013-0179" tracker="cve" /> <issue id="CVE-2013-7291" tracker="cve" /> <issue id="CVE-2011-4971" tracker="cve" /> <issue id="CVE-2013-7239" tracker="cve" /> <issue id="CVE-2013-7290" tracker="cve" /> <category>security</category> <rating>moderate</rating> <packager>darix</packager> <description>memcached was updated to version 1.4.20 to fix five security issues. These security issues were fixed: - DoS when printing out keys to be deleted in verbose mode (CVE-2013-0179) - Remote DoS (crash) via a request that triggers "unbounded key print" (CVE-2013-7291) - Remote DoS (segmentation fault) via a request to delete a key (CVE-2013-7290) - SASL authentication allows wrong credentials to access memcache (CVE-2013-7239) - Remote DoS (CVE-2011-4971) </description> <summary>memcached: Update fixes fixe security issues</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit permissions for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '14

02 Jul '14

Hello community, here is the log from the commit of package permissions for openSUSE:Factory checked in at 2014-07-02 15:18:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/permissions (Old) and /work/SRC/openSUSE:Factory/.permissions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "permissions" Changes: -------- --- /work/SRC/openSUSE:Factory/permissions/permissions.changes 2014-06-18 22:04:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.permissions.new/permissions.changes 2014-07-02 15:18:21.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 1 11:19:57 UTC 2014 - meissner(a)suse.com + +- vlock_main lost its permission checking, so remove from here. + +------------------------------------------------------------------- Old: ---- permissions-2014.06.16.1345.tar.bz2 New: ---- permissions-2014.06.30.1743.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ permissions.spec ++++++ --- /var/tmp/diff_new_pack.23DP7S/_old 2014-07-02 15:18:22.000000000 +0200 +++ /var/tmp/diff_new_pack.23DP7S/_new 2014-07-02 15:18:22.000000000 +0200 @@ -20,7 +20,7 @@ BuildRequires: libcap-devel Name: permissions -Version: 2014.06.16.1345 +Version: 2014.06.30.1743 Release: 0 Provides: aaa_base:/etc/permissions PreReq: %fillup_prereq ++++++ permissions-2014.06.16.1345.tar.bz2 -> permissions-2014.06.30.1743.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.06.16.1345/permissions new/permissions-2014.06.30.1743/permissions --- old/permissions-2014.06.16.1345/permissions 2014-06-16 13:45:27.000000000 +0200 +++ new/permissions-2014.06.30.1743/permissions 2014-06-30 17:43:17.000000000 +0200 @@ -179,8 +179,6 @@ # wodim is not allowed setuid root as cd burning does not strictly require # it (bnc#882035) /usr/bin/wodim root:root 0755 -# vlock is not allowed setuid root as code is unproven quality (bnc#882035) -/usr/sbin/vlock-main root:root 0755 # we no longer make rpm build dirs 1777 /usr/src/packages/SOURCES/ root:root 0755 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '14

02 Jul '14

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2014-07-02 15:18:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2014-06-18 22:04:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2014-07-02 15:18:20.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 1 06:47:54 UTC 2014 - lnussel(a)suse.de + +- remove fate-314974.patch which was not accepted in git + +------------------------------------------------------------------- Old: ---- fate-314974.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.Ro48gZ/_old 2014-07-02 15:18:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Ro48gZ/_new 2014-07-02 15:18:20.000000000 +0200 @@ -55,7 +55,6 @@ # Source1: README.packaging.txt Source99: aaa_base-rpmlintrc -Patch1: fate-314974.patch %description This package installs several important configuration files and central scripts. @@ -84,8 +83,6 @@ %prep %setup -q -%patch1 -p1 -chmod 755 files/usr/bin/systemd-tmpfiles-keep %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} @@ -191,7 +188,6 @@ /usr/bin/safe-rm /usr/bin/safe-rmdir /usr/bin/setJava -/usr/bin/systemd-tmpfiles-keep /usr/lib/restricted/bin/hostname /usr/sbin/Check /usr/sbin/sysconf_addword -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shorewall for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '14

02 Jul '14

Hello community, here is the log from the commit of package shorewall for openSUSE:Factory checked in at 2014-07-02 15:05:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shorewall (Old) and /work/SRC/openSUSE:Factory/.shorewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shorewall" Changes: -------- --- /work/SRC/openSUSE:Factory/shorewall/shorewall.changes 2014-06-24 15:15:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shorewall.new/shorewall.changes 2014-07-02 15:05:38.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jul 2 08:22:44 UTC 2014 - toganm(a)opensuse.org + +- Update to version 4.6.1.3 For more details see changelog.txt and + releasenotes.txt + + * Use of the 'IfEvent' action resulted in a compilation failure: + + ERROR: -j is only allowed when the ACTION is INLINE with no + parameter /usr/share/shorewall/action.IfEvent (line 139) + from /etc/shorewall/action.SSHKnock (line 8) + from /etc/shorewall/rules (line 31) + +------------------------------------------------------------------- Old: ---- shorewall-4.6.1.1.tar.bz2 shorewall-core-4.6.1.1.tar.bz2 shorewall-docs-html-4.6.1.1.tar.bz2 shorewall-init-4.6.1.1.tar.bz2 shorewall-lite-4.6.1.1.tar.bz2 shorewall6-4.6.1.1.tar.bz2 shorewall6-lite-4.6.1.1.tar.bz2 New: ---- shorewall-4.6.1.3.tar.bz2 shorewall-core-4.6.1.3.tar.bz2 shorewall-docs-html-4.6.1.3.tar.bz2 shorewall-init-4.6.1.3.tar.bz2 shorewall-lite-4.6.1.3.tar.bz2 shorewall6-4.6.1.3.tar.bz2 shorewall6-lite-4.6.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shorewall.spec ++++++ --- /var/tmp/diff_new_pack.gJecIK/_old 2014-07-02 15:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.gJecIK/_new 2014-07-02 15:05:39.000000000 +0200 @@ -20,7 +20,7 @@ %define have_systemd 1 Name: shorewall -Version: 4.6.1.1 +Version: 4.6.1.3 Release: 0 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems License: GPL-2.0 ++++++ shorewall-4.6.1.1.tar.bz2 -> shorewall-4.6.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.Amanda new/shorewall-4.6.1.3/Macros/macro.Amanda --- old/shorewall-4.6.1.1/Macros/macro.Amanda 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.Amanda 2014-06-27 17:23:04.000000000 +0200 @@ -14,7 +14,7 @@ # PORT(S) PORT(S) DEST LIMIT GROUP ?if ( __CT_TARGET && ! $AUTOHELPERS && __AMANDA_HELPER ) - PARAM - - udp 10080 ; helper=amanda + PARAM - - udp 10080 { helper=amanda } ?else PARAM - - udp 10080 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.FTP new/shorewall-4.6.1.3/Macros/macro.FTP --- old/shorewall-4.6.1.1/Macros/macro.FTP 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.FTP 2014-06-27 17:23:04.000000000 +0200 @@ -11,7 +11,7 @@ #ACTION SOURCE DEST PROTO DEST SOURCE ORIGIN RATE USER/ # PORT(S) PORT(S) DEST LIMIT GROUP ?if ( __CT_TARGET && ! $AUTOHELPERS && __FTP_HELPER ) - PARAM - - tcp 21 ; helper=ftp + PARAM - - tcp 21 { helper=ftp } ?else PARAM - - tcp 21 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.IRC new/shorewall-4.6.1.3/Macros/macro.IRC --- old/shorewall-4.6.1.1/Macros/macro.IRC 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.IRC 2014-06-27 17:23:04.000000000 +0200 @@ -12,7 +12,7 @@ # PORT(S) PORT(S) DEST LIMIT GROUP ?if ( __CT_TARGET && ! $AUTOHELPERS && __IRC_HELPER ) - PARAM - - tcp 6667 ; helper=irc + PARAM - - tcp 6667 { helper=irc } ?else PARAM - - tcp 6667 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.PPtP new/shorewall-4.6.1.3/Macros/macro.PPtP --- old/shorewall-4.6.1.1/Macros/macro.PPtP 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.PPtP 2014-06-27 17:23:04.000000000 +0200 @@ -14,7 +14,7 @@ PARAM DEST SOURCE 47 ?if ( __CT_TARGET && ! $AUTOHELPERS && __PPTP_HELPER ) - PARAM - - tcp 1723 ; helper=pptp + PARAM - - tcp 1723 { helper=pptp } ?else PARAM - - tcp 1723 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.SANE new/shorewall-4.6.1.3/Macros/macro.SANE --- old/shorewall-4.6.1.1/Macros/macro.SANE 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.SANE 2014-06-27 17:23:04.000000000 +0200 @@ -12,7 +12,7 @@ # PORT(S) PORT(S) DEST LIMIT GROUP ?if ( __CT_TARGET && ! $AUTOHELPERS && __SANE_HELPER ) - PARAM - - tcp 6566 ; helper=sane + PARAM - - tcp 6566 { helper=sane } ?else PARAM - - tcp 6566 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.SIP new/shorewall-4.6.1.3/Macros/macro.SIP --- old/shorewall-4.6.1.1/Macros/macro.SIP 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.SIP 2014-06-27 17:23:04.000000000 +0200 @@ -12,7 +12,7 @@ # PORT(S) PORT(S) DEST LIMIT GROUP ?if ( __CT_TARGET && ! $AUTOHELPERS && __SIP_HELPER ) - PARAM - - udp 5060 ; helper=sip + PARAM - - udp 5060 { helper=sip } ?else PARAM - - udp 5060 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.SMB new/shorewall-4.6.1.3/Macros/macro.SMB --- old/shorewall-4.6.1.1/Macros/macro.SMB 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.SMB 2014-06-27 17:23:04.000000000 +0200 @@ -17,7 +17,7 @@ PARAM - - udp 135,445 ?if ( __CT_TARGET && ! $AUTOHELPERS && __NETBIOS_NS_HELPER ) - PARAM - - udp 137 ; helper=netbios-ns + PARAM - - udp 137 { helper=netbios-ns } PARAM - - udp 138:139 ?else PARAM - - udp 137:139 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.SMBBI new/shorewall-4.6.1.3/Macros/macro.SMBBI --- old/shorewall-4.6.1.1/Macros/macro.SMBBI 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.SMBBI 2014-06-27 17:23:04.000000000 +0200 @@ -17,7 +17,7 @@ PARAM - - udp 135,445 ?if ( __CT_TARGET && ! $AUTOHELPERS && __NETBIOS_NS_HELPER ) - PARAM - - udp 137 ; helper=netbios-ns + PARAM - - udp 137 { helper=netbios-ns } PARAM - - udp 138:139 ?else PARAM - - udp 137:139 @@ -28,7 +28,7 @@ PARAM DEST SOURCE udp 135,445 ?if ( __CT_TARGET && ! $AUTOHELPERS && __NETBIOS_NS_HELPER ) - PARAM DEST SOURCE udp 137 ; helper=netbios-ns + PARAM DEST SOURCE udp 137 { helper=netbios-ns } PARAM DEST SOURCE udp 138:139 ?else PARAM DEST SOURCE udp 137:139 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.SNMP new/shorewall-4.6.1.3/Macros/macro.SNMP --- old/shorewall-4.6.1.1/Macros/macro.SNMP 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.SNMP 2014-06-27 17:23:04.000000000 +0200 @@ -14,7 +14,7 @@ # PORT(S) PORT(S) DEST LIMIT GROUP ?if ( __CT_TARGET && ! $AUTOHELPERS && __SNMP_HELPER ) - PARAM - - udp 161 ; helper=snmp + PARAM - - udp 161 { helper=snmp } ?else PARAM - - udp 161 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Macros/macro.TFTP new/shorewall-4.6.1.3/Macros/macro.TFTP --- old/shorewall-4.6.1.1/Macros/macro.TFTP 2014-06-15 18:03:10.000000000 +0200 +++ new/shorewall-4.6.1.3/Macros/macro.TFTP 2014-06-27 17:23:04.000000000 +0200 @@ -14,7 +14,7 @@ # PORT(S) PORT(S) DEST LIMIT GROUP ?if ( __CT_TARGET && ! $AUTOHELPERS && __TFTP_HELPER ) - PARAM - - udp 69 ; helper=tftp + PARAM - - udp 69 { helper=tftp } ?else PARAM - - udp 69 ?endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Perl/Shorewall/Config.pm new/shorewall-4.6.1.3/Perl/Shorewall/Config.pm --- old/shorewall-4.6.1.1/Perl/Shorewall/Config.pm 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/Perl/Shorewall/Config.pm 2014-06-27 18:35:52.000000000 +0200 @@ -709,7 +709,7 @@ TC_SCRIPT => '', EXPORT => 0, KLUDGEFREE => '', - VERSION => "4.6.1.1", + VERSION => "4.6.1.3", CAPVERSION => 40600 , ); # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Perl/Shorewall/Rules.pm new/shorewall-4.6.1.3/Perl/Shorewall/Rules.pm --- old/shorewall-4.6.1.1/Perl/Shorewall/Rules.pm 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/Perl/Shorewall/Rules.pm 2014-06-27 18:35:52.000000000 +0200 @@ -2950,7 +2950,7 @@ $matches .= ' ' unless $matches =~ /^(?:.+\s)?$/; - set_inline_matches $matches if $target =~ /^INLINE(?::.*)?$/; + set_inline_matches( $target =~ /^INLINE(?::.*)?$/ ? $matches : '' ); if ( $isstatematch ) { if ( $statematch ) { @@ -3023,6 +3023,8 @@ $proto .= ' ' unless $proto =~ /^(?:.+\s)?$/; + set_inline_matches( '' ) if $config{INLINE_MATCHES}; + if ( $passedproto eq '-' || $passedproto eq 'tcp' || $passedproto eq '6' ) { # # For other protos, a 'no rule generated' warning will be issued diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Samples/three-interfaces/masq.annotated new/shorewall-4.6.1.3/Samples/three-interfaces/masq.annotated --- old/shorewall-4.6.1.1/Samples/three-interfaces/masq.annotated 2014-06-15 18:18:50.000000000 +0200 +++ new/shorewall-4.6.1.3/Samples/three-interfaces/masq.annotated 2014-06-27 18:37:24.000000000 +0200 @@ -101,7 +101,8 @@ # # See example 8 below. # -# SOURCE (Formerly called SUBNET) - {interface|address[,address][exclusion]} +# SOURCE (Formerly called SUBNET - Optional) - [interface|address[,address][ +# exclusion]] # # Set of hosts that you wish to masquerade. You can specify this as an # address (net or host) or as an interface (use of an interface is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/Samples/two-interfaces/masq.annotated new/shorewall-4.6.1.3/Samples/two-interfaces/masq.annotated --- old/shorewall-4.6.1.1/Samples/two-interfaces/masq.annotated 2014-06-15 18:18:55.000000000 +0200 +++ new/shorewall-4.6.1.3/Samples/two-interfaces/masq.annotated 2014-06-27 18:37:29.000000000 +0200 @@ -101,7 +101,8 @@ # # See example 8 below. # -# SOURCE (Formerly called SUBNET) - {interface|address[,address][exclusion]} +# SOURCE (Formerly called SUBNET - Optional) - [interface|address[,address][ +# exclusion]] # # Set of hosts that you wish to masquerade. You can specify this as an # address (net or host) or as an interface (use of an interface is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/changelog.txt new/shorewall-4.6.1.3/changelog.txt --- old/shorewall-4.6.1.1/changelog.txt 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/changelog.txt 2014-06-27 18:35:52.000000000 +0200 @@ -1,3 +1,17 @@ +Changes in 4.6.1.3 + +1) Update release documents. + +2) Correct the compiler's handling of IfEvent. + +Changes in 4.6.1.2 + +1) Update release documents. + +2) Correct 'masq' manpages. + +3) Allow INLINE_MATCHES=Yes with AUTOHELPERS=No to work correctly. + Changes in 4.6.1.1 1) Update release documents. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/configfiles/masq.annotated new/shorewall-4.6.1.3/configfiles/masq.annotated --- old/shorewall-4.6.1.1/configfiles/masq.annotated 2014-06-15 18:18:31.000000000 +0200 +++ new/shorewall-4.6.1.3/configfiles/masq.annotated 2014-06-27 18:37:05.000000000 +0200 @@ -97,7 +97,8 @@ # # See example 8 below. # -# SOURCE (Formerly called SUBNET) - {interface|address[,address][exclusion]} +# SOURCE (Formerly called SUBNET - Optional) - [interface|address[,address][ +# exclusion]] # # Set of hosts that you wish to masquerade. You can specify this as an # address (net or host) or as an interface (use of an interface is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/configure new/shorewall-4.6.1.3/configure --- old/shorewall-4.6.1.1/configure 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/configure 2014-06-27 18:35:52.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.6.1.1 +VERSION=4.6.1.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/configure.pl new/shorewall-4.6.1.3/configure.pl --- old/shorewall-4.6.1.1/configure.pl 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/configure.pl 2014-06-27 18:35:52.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.6.1.1' + VERSION => '4.6.1.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/install.sh new/shorewall-4.6.1.3/install.sh --- old/shorewall-4.6.1.1/install.sh 2014-06-15 18:17:15.000000000 +0200 +++ new/shorewall-4.6.1.3/install.sh 2014-06-27 18:35:52.000000000 +0200 @@ -22,7 +22,7 @@ # along with this program; if not, see <http://www.gnu.org/licenses/>. # -VERSION=4.6.1.1 +VERSION=4.6.1.3 # # Change to the directory containing this script diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/known_problems.txt new/shorewall-4.6.1.3/known_problems.txt --- old/shorewall-4.6.1.1/known_problems.txt 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/known_problems.txt 2014-06-27 18:35:52.000000000 +0200 @@ -1,2 +1,24 @@ 1) On systems running Upstart, shorewall-init cannot reliably secure the firewall before interfaces are brought up. + +2) When INLINE_MATCHES=Yes and AUTOHELPERS=No, start or restart can + fail during script execution with this diagnostic: + + Running /sbin/iptables-restore... + Bad argument `helper=netbios-ns' + Error occurred at line: 228 + Try `iptables-restore -h' or 'iptables-restore --help' for more + information. + ERROR: iptables-restore Failed. Input is in + /var/lib/shorewall/.iptables-restore-input + + Corrected in Shorewall 4.6.1.2 + +3) Use of the 'IfEvent' action results in a compilation failure: + + ERROR: -j is only allowed when the ACTION is INLINE with no + parameter /usr/share/shorewall/action.IfEvent (line 139) + from /etc/shorewall/action.SSHKnock (line 8) + from /etc/shorewall/rules (line 31) + + Corrected in Shorewall 4.6.1.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-accounting.5 new/shorewall-4.6.1.3/manpages/shorewall-accounting.5 --- old/shorewall-4.6.1.1/manpages/shorewall-accounting.5 2014-06-15 18:17:20.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-accounting.5 2014-06-27 18:35:54.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-accounting .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-ACCOUNTIN" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-ACCOUNTIN" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-actions.5 new/shorewall-4.6.1.3/manpages/shorewall-actions.5 --- old/shorewall-4.6.1.1/manpages/shorewall-actions.5 2014-06-15 18:17:22.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-actions.5 2014-06-27 18:35:56.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-actions .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-ACTIONS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-ACTIONS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-arprules.5 new/shorewall-4.6.1.3/manpages/shorewall-arprules.5 --- old/shorewall-4.6.1.1/manpages/shorewall-arprules.5 2014-06-15 18:17:23.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-arprules.5 2014-06-27 18:35:57.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-arprules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-ARPRULES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-ARPRULES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-blacklist.5 new/shorewall-4.6.1.3/manpages/shorewall-blacklist.5 --- old/shorewall-4.6.1.1/manpages/shorewall-blacklist.5 2014-06-15 18:17:25.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-blacklist.5 2014-06-27 18:35:59.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-blacklist .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-BLACKLIST" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-BLACKLIST" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-blrules.5 new/shorewall-4.6.1.3/manpages/shorewall-blrules.5 --- old/shorewall-4.6.1.1/manpages/shorewall-blrules.5 2014-06-15 18:17:26.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-blrules.5 2014-06-27 18:36:00.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-blrules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-BLRULES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-BLRULES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-conntrack.5 new/shorewall-4.6.1.3/manpages/shorewall-conntrack.5 --- old/shorewall-4.6.1.1/manpages/shorewall-conntrack.5 2014-06-15 18:17:32.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-conntrack.5 2014-06-27 18:36:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall6-conntrack .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL6\-CONNTRAC" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL6\-CONNTRAC" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-ecn.5 new/shorewall-4.6.1.3/manpages/shorewall-ecn.5 --- old/shorewall-4.6.1.1/manpages/shorewall-ecn.5 2014-06-15 18:17:34.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-ecn.5 2014-06-27 18:36:08.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-ecn .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-ECN" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-ECN" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-exclusion.5 new/shorewall-4.6.1.3/manpages/shorewall-exclusion.5 --- old/shorewall-4.6.1.1/manpages/shorewall-exclusion.5 2014-06-15 18:17:35.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-exclusion.5 2014-06-27 18:36:10.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-exclusion .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-EXCLUSION" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-EXCLUSION" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-hosts.5 new/shorewall-4.6.1.3/manpages/shorewall-hosts.5 --- old/shorewall-4.6.1.1/manpages/shorewall-hosts.5 2014-06-15 18:17:37.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-hosts.5 2014-06-27 18:36:11.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-hosts .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-HOSTS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-HOSTS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-init.8 new/shorewall-4.6.1.3/manpages/shorewall-init.8 --- old/shorewall-4.6.1.1/manpages/shorewall-init.8 2014-06-15 18:17:38.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-init.8 2014-06-27 18:36:12.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-init .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Administrative Commands .\" Source: Administrative Commands .\" Language: English .\" -.TH "SHOREWALL\-INIT" "8" "06/15/2014" "Administrative Commands" "Administrative Commands" +.TH "SHOREWALL\-INIT" "8" "06/27/2014" "Administrative Commands" "Administrative Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-interfaces.5 new/shorewall-4.6.1.3/manpages/shorewall-interfaces.5 --- old/shorewall-4.6.1.1/manpages/shorewall-interfaces.5 2014-06-15 18:17:40.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-interfaces.5 2014-06-27 18:36:14.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-interfaces .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-INTERFACE" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-INTERFACE" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-ipsets.5 new/shorewall-4.6.1.3/manpages/shorewall-ipsets.5 --- old/shorewall-4.6.1.1/manpages/shorewall-ipsets.5 2014-06-15 18:17:41.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-ipsets.5 2014-06-27 18:36:15.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-ipsets .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-IPSETS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-IPSETS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-maclist.5 new/shorewall-4.6.1.3/manpages/shorewall-maclist.5 --- old/shorewall-4.6.1.1/manpages/shorewall-maclist.5 2014-06-15 18:17:42.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-maclist.5 2014-06-27 18:36:17.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-maclist .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-MACLIST" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-MACLIST" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-mangle.5 new/shorewall-4.6.1.3/manpages/shorewall-mangle.5 --- old/shorewall-4.6.1.1/manpages/shorewall-mangle.5 2014-06-15 18:17:44.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-mangle.5 2014-06-27 18:36:19.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-mangle .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-MANGLE" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-MANGLE" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-masq.5 new/shorewall-4.6.1.3/manpages/shorewall-masq.5 --- old/shorewall-4.6.1.1/manpages/shorewall-masq.5 2014-06-15 18:17:46.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-masq.5 2014-06-27 18:36:20.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-masq .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-MASQ" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-MASQ" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -176,7 +176,7 @@ See example 8 below\&. .RE .PP -\fBSOURCE\fR (Formerly called SUBNET) \- {\fIinterface\fR|\fIaddress\fR[\fB,\fR\fIaddress\fR][\fIexclusion\fR]} +\fBSOURCE\fR (Formerly called SUBNET \- Optional) \- [\fIinterface\fR|\fIaddress\fR[\fB,\fR\fIaddress\fR][\fIexclusion\fR]] .RS 4 Set of hosts that you wish to masquerade\&. You can specify this as an \fIaddress\fR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-modules.5 new/shorewall-4.6.1.3/manpages/shorewall-modules.5 --- old/shorewall-4.6.1.1/manpages/shorewall-modules.5 2014-06-15 18:17:47.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-modules.5 2014-06-27 18:36:21.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-modules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-MODULES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-MODULES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-nat.5 new/shorewall-4.6.1.3/manpages/shorewall-nat.5 --- old/shorewall-4.6.1.1/manpages/shorewall-nat.5 2014-06-15 18:17:48.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-nat.5 2014-06-27 18:36:23.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-nat .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-NAT" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-NAT" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-nesting.5 new/shorewall-4.6.1.3/manpages/shorewall-nesting.5 --- old/shorewall-4.6.1.1/manpages/shorewall-nesting.5 2014-06-15 18:17:50.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-nesting.5 2014-06-27 18:36:24.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-nesting .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-NESTING" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-NESTING" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-netmap.5 new/shorewall-4.6.1.3/manpages/shorewall-netmap.5 --- old/shorewall-4.6.1.1/manpages/shorewall-netmap.5 2014-06-15 18:17:51.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-netmap.5 2014-06-27 18:36:26.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-netmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-NETMAP" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-NETMAP" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-params.5 new/shorewall-4.6.1.3/manpages/shorewall-params.5 --- old/shorewall-4.6.1.1/manpages/shorewall-params.5 2014-06-15 18:17:52.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-params.5 2014-06-27 18:36:27.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-params .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-PARAMS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-PARAMS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-policy.5 new/shorewall-4.6.1.3/manpages/shorewall-policy.5 --- old/shorewall-4.6.1.1/manpages/shorewall-policy.5 2014-06-15 18:17:54.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-policy.5 2014-06-27 18:36:28.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-policy .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-POLICY" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-POLICY" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-providers.5 new/shorewall-4.6.1.3/manpages/shorewall-providers.5 --- old/shorewall-4.6.1.1/manpages/shorewall-providers.5 2014-06-15 18:17:55.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-providers.5 2014-06-27 18:36:30.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-providers .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-PROVIDERS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-PROVIDERS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-proxyarp.5 new/shorewall-4.6.1.3/manpages/shorewall-proxyarp.5 --- old/shorewall-4.6.1.1/manpages/shorewall-proxyarp.5 2014-06-15 18:17:57.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-proxyarp.5 2014-06-27 18:36:31.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-proxyarp .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-PROXYARP" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-PROXYARP" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-routes.5 new/shorewall-4.6.1.3/manpages/shorewall-routes.5 --- old/shorewall-4.6.1.1/manpages/shorewall-routes.5 2014-06-15 18:17:59.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-routes.5 2014-06-27 18:36:34.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-routes .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-ROUTES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-ROUTES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-routestopped.5 new/shorewall-4.6.1.3/manpages/shorewall-routestopped.5 --- old/shorewall-4.6.1.1/manpages/shorewall-routestopped.5 2014-06-15 18:17:58.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-routestopped.5 2014-06-27 18:36:32.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-routestopped .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-ROUTESTOP" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-ROUTESTOP" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-rtrules.5 new/shorewall-4.6.1.3/manpages/shorewall-rtrules.5 --- old/shorewall-4.6.1.1/manpages/shorewall-rtrules.5 2014-06-15 18:18:01.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-rtrules.5 2014-06-27 18:36:35.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-rtrules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-RTRULES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-RTRULES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-rules.5 new/shorewall-4.6.1.3/manpages/shorewall-rules.5 --- old/shorewall-4.6.1.1/manpages/shorewall-rules.5 2014-06-15 18:18:03.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-rules.5 2014-06-27 18:36:38.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-rules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-RULES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-RULES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-secmarks.5 new/shorewall-4.6.1.3/manpages/shorewall-secmarks.5 --- old/shorewall-4.6.1.1/manpages/shorewall-secmarks.5 2014-06-15 18:18:05.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-secmarks.5 2014-06-27 18:36:39.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-secmarks .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-SECMARKS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-SECMARKS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-stoppedrules.5 new/shorewall-4.6.1.3/manpages/shorewall-stoppedrules.5 --- old/shorewall-4.6.1.1/manpages/shorewall-stoppedrules.5 2014-06-15 18:18:06.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-stoppedrules.5 2014-06-27 18:36:41.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-stoppedrules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-STOPPEDRU" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-STOPPEDRU" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tcclasses.5 new/shorewall-4.6.1.3/manpages/shorewall-tcclasses.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tcclasses.5 2014-06-15 18:18:08.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tcclasses.5 2014-06-27 18:36:42.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcclasses .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-TCCLASSES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-TCCLASSES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tcdevices.5 new/shorewall-4.6.1.3/manpages/shorewall-tcdevices.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tcdevices.5 2014-06-15 18:18:09.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tcdevices.5 2014-06-27 18:36:44.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcdevices .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-TCDEVICES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-TCDEVICES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tcfilters.5 new/shorewall-4.6.1.3/manpages/shorewall-tcfilters.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tcfilters.5 2014-06-15 18:18:11.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tcfilters.5 2014-06-27 18:36:45.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcfilters .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-TCFILTERS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-TCFILTERS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tcinterfaces.5 new/shorewall-4.6.1.3/manpages/shorewall-tcinterfaces.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tcinterfaces.5 2014-06-15 18:18:12.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tcinterfaces.5 2014-06-27 18:36:46.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcinterfaces .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-TCINTERFA" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-TCINTERFA" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tcpri.5 new/shorewall-4.6.1.3/manpages/shorewall-tcpri.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tcpri.5 2014-06-15 18:18:13.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tcpri.5 2014-06-27 18:36:48.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcpri .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-TCPRI" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-TCPRI" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tcrules.5 new/shorewall-4.6.1.3/manpages/shorewall-tcrules.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tcrules.5 2014-06-15 18:18:15.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tcrules.5 2014-06-27 18:36:49.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-mangle .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-MANGLE" "5" "06/15/2014" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-MANGLE" "5" "06/27/2014" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tos.5 new/shorewall-4.6.1.3/manpages/shorewall-tos.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tos.5 2014-06-15 18:18:16.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tos.5 2014-06-27 18:36:51.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tos .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-TOS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-TOS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-tunnels.5 new/shorewall-4.6.1.3/manpages/shorewall-tunnels.5 --- old/shorewall-4.6.1.1/manpages/shorewall-tunnels.5 2014-06-15 18:18:18.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-tunnels.5 2014-06-27 18:36:52.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tunnels .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-TUNNELS" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-TUNNELS" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-vardir.5 new/shorewall-4.6.1.3/manpages/shorewall-vardir.5 --- old/shorewall-4.6.1.1/manpages/shorewall-vardir.5 2014-06-15 18:18:19.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-vardir.5 2014-06-27 18:36:54.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-vardir .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-VARDIR" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-VARDIR" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall-zones.5 new/shorewall-4.6.1.3/manpages/shorewall-zones.5 --- old/shorewall-4.6.1.1/manpages/shorewall-zones.5 2014-06-15 18:18:24.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall-zones.5 2014-06-27 18:36:58.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-zones .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-ZONES" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-ZONES" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall.8 new/shorewall-4.6.1.3/manpages/shorewall.8 --- old/shorewall-4.6.1.1/manpages/shorewall.8 2014-06-15 18:18:22.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall.8 2014-06-27 18:36:56.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Administrative Commands .\" Source: Administrative Commands .\" Language: English .\" -.TH "SHOREWALL" "8" "06/15/2014" "Administrative Commands" "Administrative Commands" +.TH "SHOREWALL" "8" "06/27/2014" "Administrative Commands" "Administrative Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/manpages/shorewall.conf.5 new/shorewall-4.6.1.3/manpages/shorewall.conf.5 --- old/shorewall-4.6.1.1/manpages/shorewall.conf.5 2014-06-15 18:17:31.000000000 +0200 +++ new/shorewall-4.6.1.3/manpages/shorewall.conf.5 2014-06-27 18:36:05.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall.conf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\&.CONF" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\&.CONF" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/releasenotes.txt new/shorewall-4.6.1.3/releasenotes.txt --- old/shorewall-4.6.1.1/releasenotes.txt 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/releasenotes.txt 2014-06-27 18:35:52.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 6 . 1 . 1 + S H O R E W A L L 4 . 6 . 1 . 3 ------------------------------------ - J u n e 1 5 , 2 0 1 4 + J u n e 2 5 , 2 0 1 4 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -14,6 +14,32 @@ I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ---------------------------------------------------------------------------- +4.6.1.3 + +1) Use of the 'IfEvent' action resulted in a compilation failure: + + ERROR: -j is only allowed when the ACTION is INLINE with no + parameter /usr/share/shorewall/action.IfEvent (line 139) + from /etc/shorewall/action.SSHKnock (line 8) + from /etc/shorewall/rules (line 31) + +4.6.1.2 + +1) The shorewall-masq(5) and shorewall6-masq(5) manpages had a mangled + heading for the description of the SOURCE column, leading some + readers to assert the that description was missing. + +2) When INLINE_MATCHES=Yes and AUTOHELPERS=No, start or restart could + fail during script execution with this diagnostic: + + Running /sbin/iptables-restore... + Bad argument `helper=netbios-ns' + Error occurred at line: nnn + Try `iptables-restore -h' or 'iptables-restore --help' for more + information. + ERROR: iptables-restore Failed. Input is in + /var/lib/shorewall/.iptables-restore-input + 4.6.1.1 1) An improved error message is generatred when a server address list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/shorewall.spec new/shorewall-4.6.1.3/shorewall.spec --- old/shorewall-4.6.1.1/shorewall.spec 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-4.6.1.3/shorewall.spec 2014-06-27 18:35:52.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall %define version 4.6.1 -%define release 1 +%define release 3 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -130,6 +130,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Sat Jun 21 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-3 +* Fri Jun 20 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-2 * Sun Jun 08 2014 Tom Eastep tom(a)shorewall.net - Updated to 4.6.1-1 * Wed Jun 04 2014 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.1.1/uninstall.sh new/shorewall-4.6.1.3/uninstall.sh --- old/shorewall-4.6.1.1/uninstall.sh 2014-06-15 18:17:15.000000000 +0200 +++ new/shorewall-4.6.1.3/uninstall.sh 2014-06-27 18:35:52.000000000 +0200 @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.6.1.1 +VERSION=4.6.1.3 usage() # $1 = exit status { ++++++ shorewall-core-4.6.1.1.tar.bz2 -> shorewall-core-4.6.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/changelog.txt new/shorewall-core-4.6.1.3/changelog.txt --- old/shorewall-core-4.6.1.1/changelog.txt 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-core-4.6.1.3/changelog.txt 2014-06-27 18:35:52.000000000 +0200 @@ -1,3 +1,17 @@ +Changes in 4.6.1.3 + +1) Update release documents. + +2) Correct the compiler's handling of IfEvent. + +Changes in 4.6.1.2 + +1) Update release documents. + +2) Correct 'masq' manpages. + +3) Allow INLINE_MATCHES=Yes with AUTOHELPERS=No to work correctly. + Changes in 4.6.1.1 1) Update release documents. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/configure new/shorewall-core-4.6.1.3/configure --- old/shorewall-core-4.6.1.1/configure 2014-06-15 18:17:15.000000000 +0200 +++ new/shorewall-core-4.6.1.3/configure 2014-06-27 18:35:52.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.6.1.1 +VERSION=4.6.1.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/configure.pl new/shorewall-core-4.6.1.3/configure.pl --- old/shorewall-core-4.6.1.1/configure.pl 2014-06-15 18:17:15.000000000 +0200 +++ new/shorewall-core-4.6.1.3/configure.pl 2014-06-27 18:35:52.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.6.1.1' + VERSION => '4.6.1.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/install.sh new/shorewall-core-4.6.1.3/install.sh --- old/shorewall-core-4.6.1.1/install.sh 2014-06-15 18:17:15.000000000 +0200 +++ new/shorewall-core-4.6.1.3/install.sh 2014-06-27 18:35:52.000000000 +0200 @@ -22,7 +22,7 @@ # along with this program; if not, see <http://www.gnu.org/licenses/>. # -VERSION=4.6.1.1 +VERSION=4.6.1.3 usage() # $1 = exit status { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/known_problems.txt new/shorewall-core-4.6.1.3/known_problems.txt --- old/shorewall-core-4.6.1.1/known_problems.txt 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-core-4.6.1.3/known_problems.txt 2014-06-27 18:35:52.000000000 +0200 @@ -1,2 +1,24 @@ 1) On systems running Upstart, shorewall-init cannot reliably secure the firewall before interfaces are brought up. + +2) When INLINE_MATCHES=Yes and AUTOHELPERS=No, start or restart can + fail during script execution with this diagnostic: + + Running /sbin/iptables-restore... + Bad argument `helper=netbios-ns' + Error occurred at line: 228 + Try `iptables-restore -h' or 'iptables-restore --help' for more + information. + ERROR: iptables-restore Failed. Input is in + /var/lib/shorewall/.iptables-restore-input + + Corrected in Shorewall 4.6.1.2 + +3) Use of the 'IfEvent' action results in a compilation failure: + + ERROR: -j is only allowed when the ACTION is INLINE with no + parameter /usr/share/shorewall/action.IfEvent (line 139) + from /etc/shorewall/action.SSHKnock (line 8) + from /etc/shorewall/rules (line 31) + + Corrected in Shorewall 4.6.1.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/releasenotes.txt new/shorewall-core-4.6.1.3/releasenotes.txt --- old/shorewall-core-4.6.1.1/releasenotes.txt 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-core-4.6.1.3/releasenotes.txt 2014-06-27 18:35:52.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 6 . 1 . 1 + S H O R E W A L L 4 . 6 . 1 . 3 ------------------------------------ - J u n e 1 5 , 2 0 1 4 + J u n e 2 5 , 2 0 1 4 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -14,6 +14,32 @@ I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ---------------------------------------------------------------------------- +4.6.1.3 + +1) Use of the 'IfEvent' action resulted in a compilation failure: + + ERROR: -j is only allowed when the ACTION is INLINE with no + parameter /usr/share/shorewall/action.IfEvent (line 139) + from /etc/shorewall/action.SSHKnock (line 8) + from /etc/shorewall/rules (line 31) + +4.6.1.2 + +1) The shorewall-masq(5) and shorewall6-masq(5) manpages had a mangled + heading for the description of the SOURCE column, leading some + readers to assert the that description was missing. + +2) When INLINE_MATCHES=Yes and AUTOHELPERS=No, start or restart could + fail during script execution with this diagnostic: + + Running /sbin/iptables-restore... + Bad argument `helper=netbios-ns' + Error occurred at line: nnn + Try `iptables-restore -h' or 'iptables-restore --help' for more + information. + ERROR: iptables-restore Failed. Input is in + /var/lib/shorewall/.iptables-restore-input + 4.6.1.1 1) An improved error message is generatred when a server address list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/shorewall-core.spec new/shorewall-core-4.6.1.3/shorewall-core.spec --- old/shorewall-core-4.6.1.1/shorewall-core.spec 2014-06-15 18:17:16.000000000 +0200 +++ new/shorewall-core-4.6.1.3/shorewall-core.spec 2014-06-27 18:35:52.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall-core %define version 4.6.1 -%define release 1 +%define release 3 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -62,6 +62,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt %changelog +* Sat Jun 21 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-3 +* Fri Jun 20 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-2 * Sun Jun 08 2014 Tom Eastep tom(a)shorewall.net - Updated to 4.6.1-1 * Wed Jun 04 2014 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.1.1/uninstall.sh new/shorewall-core-4.6.1.3/uninstall.sh --- old/shorewall-core-4.6.1.1/uninstall.sh 2014-06-15 18:17:15.000000000 +0200 +++ new/shorewall-core-4.6.1.3/uninstall.sh 2014-06-27 18:35:52.000000000 +0200 @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.6.1.1 +VERSION=4.6.1.3 usage() # $1 = exit status { ++++++ shorewall-docs-html-4.6.1.1.tar.bz2 -> shorewall-docs-html-4.6.1.3.tar.bz2 ++++++ ++++ 6805 lines of diff (skipped) ++++++ shorewall-init-4.6.1.1.tar.bz2 -> shorewall-init-4.6.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.1.1/changelog.txt new/shorewall-init-4.6.1.3/changelog.txt --- old/shorewall-init-4.6.1.1/changelog.txt 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-init-4.6.1.3/changelog.txt 2014-06-27 18:35:53.000000000 +0200 @@ -1,3 +1,17 @@ +Changes in 4.6.1.3 + +1) Update release documents. + +2) Correct the compiler's handling of IfEvent. + +Changes in 4.6.1.2 + +1) Update release documents. + +2) Correct 'masq' manpages. + +3) Allow INLINE_MATCHES=Yes with AUTOHELPERS=No to work correctly. + Changes in 4.6.1.1 1) Update release documents. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.1.1/configure new/shorewall-init-4.6.1.3/configure --- old/shorewall-init-4.6.1.1/configure 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-init-4.6.1.3/configure 2014-06-27 18:35:52.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.6.1.1 +VERSION=4.6.1.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.1.1/configure.pl new/shorewall-init-4.6.1.3/configure.pl --- old/shorewall-init-4.6.1.1/configure.pl 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-init-4.6.1.3/configure.pl 2014-06-27 18:35:52.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.6.1.1' + VERSION => '4.6.1.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.1.1/install.sh new/shorewall-init-4.6.1.3/install.sh --- old/shorewall-init-4.6.1.1/install.sh 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-init-4.6.1.3/install.sh 2014-06-27 18:35:52.000000000 +0200 @@ -27,7 +27,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.6.1.1 +VERSION=4.6.1.3 usage() # $1 = exit status { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.1.1/releasenotes.txt new/shorewall-init-4.6.1.3/releasenotes.txt --- old/shorewall-init-4.6.1.1/releasenotes.txt 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-init-4.6.1.3/releasenotes.txt 2014-06-27 18:35:53.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 6 . 1 . 1 + S H O R E W A L L 4 . 6 . 1 . 3 ------------------------------------ - J u n e 1 5 , 2 0 1 4 + J u n e 2 5 , 2 0 1 4 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -14,6 +14,32 @@ I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ---------------------------------------------------------------------------- +4.6.1.3 + +1) Use of the 'IfEvent' action resulted in a compilation failure: + + ERROR: -j is only allowed when the ACTION is INLINE with no + parameter /usr/share/shorewall/action.IfEvent (line 139) + from /etc/shorewall/action.SSHKnock (line 8) + from /etc/shorewall/rules (line 31) + +4.6.1.2 + +1) The shorewall-masq(5) and shorewall6-masq(5) manpages had a mangled + heading for the description of the SOURCE column, leading some + readers to assert the that description was missing. + +2) When INLINE_MATCHES=Yes and AUTOHELPERS=No, start or restart could + fail during script execution with this diagnostic: + + Running /sbin/iptables-restore... + Bad argument `helper=netbios-ns' + Error occurred at line: nnn + Try `iptables-restore -h' or 'iptables-restore --help' for more + information. + ERROR: iptables-restore Failed. Input is in + /var/lib/shorewall/.iptables-restore-input + 4.6.1.1 1) An improved error message is generatred when a server address list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.1.1/shorewall-init.spec new/shorewall-init-4.6.1.3/shorewall-init.spec --- old/shorewall-init-4.6.1.1/shorewall-init.spec 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-init-4.6.1.3/shorewall-init.spec 2014-06-27 18:35:52.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall-init %define version 4.6.1 -%define release 1 +%define release 3 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -125,6 +125,10 @@ %doc COPYING changelog.txt releasenotes.txt %changelog +* Sat Jun 21 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-3 +* Fri Jun 20 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-2 * Sun Jun 08 2014 Tom Eastep tom(a)shorewall.net - Updated to 4.6.1-1 * Wed Jun 04 2014 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.1.1/uninstall.sh new/shorewall-init-4.6.1.3/uninstall.sh --- old/shorewall-init-4.6.1.1/uninstall.sh 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-init-4.6.1.3/uninstall.sh 2014-06-27 18:35:52.000000000 +0200 @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.6.1.1 +VERSION=4.6.1.3 usage() # $1 = exit status { ++++++ shorewall-lite-4.6.1.1.tar.bz2 -> shorewall-lite-4.6.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/changelog.txt new/shorewall-lite-4.6.1.3/changelog.txt --- old/shorewall-lite-4.6.1.1/changelog.txt 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/changelog.txt 2014-06-27 18:35:53.000000000 +0200 @@ -1,3 +1,17 @@ +Changes in 4.6.1.3 + +1) Update release documents. + +2) Correct the compiler's handling of IfEvent. + +Changes in 4.6.1.2 + +1) Update release documents. + +2) Correct 'masq' manpages. + +3) Allow INLINE_MATCHES=Yes with AUTOHELPERS=No to work correctly. + Changes in 4.6.1.1 1) Update release documents. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/configure new/shorewall-lite-4.6.1.3/configure --- old/shorewall-lite-4.6.1.1/configure 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/configure 2014-06-27 18:35:53.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.6.1.1 +VERSION=4.6.1.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/configure.pl new/shorewall-lite-4.6.1.3/configure.pl --- old/shorewall-lite-4.6.1.1/configure.pl 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/configure.pl 2014-06-27 18:35:53.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.6.1.1' + VERSION => '4.6.1.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/install.sh new/shorewall-lite-4.6.1.3/install.sh --- old/shorewall-lite-4.6.1.1/install.sh 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/install.sh 2014-06-27 18:35:53.000000000 +0200 @@ -22,7 +22,7 @@ # along with this program; if not, see <http://www.gnu.org/licenses/>. # -VERSION=4.6.1.1 +VERSION=4.6.1.3 usage() # $1 = exit status { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/manpages/shorewall-lite-vardir.5 new/shorewall-lite-4.6.1.3/manpages/shorewall-lite-vardir.5 --- old/shorewall-lite-4.6.1.1/manpages/shorewall-lite-vardir.5 2014-06-15 18:20:38.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/manpages/shorewall-lite-vardir.5 2014-06-27 18:39:10.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-lite-vardir .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-LITE\-VAR" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-LITE\-VAR" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/manpages/shorewall-lite.8 new/shorewall-lite-4.6.1.3/manpages/shorewall-lite.8 --- old/shorewall-lite-4.6.1.1/manpages/shorewall-lite.8 2014-06-15 18:20:40.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/manpages/shorewall-lite.8 2014-06-27 18:39:12.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-lite .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Administrative Commands .\" Source: Administrative Commands .\" Language: English .\" -.TH "SHOREWALL\-LITE" "8" "06/15/2014" "Administrative Commands" "Administrative Commands" +.TH "SHOREWALL\-LITE" "8" "06/27/2014" "Administrative Commands" "Administrative Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/manpages/shorewall-lite.conf.5 new/shorewall-lite-4.6.1.3/manpages/shorewall-lite.conf.5 --- old/shorewall-lite-4.6.1.1/manpages/shorewall-lite.conf.5 2014-06-15 18:20:37.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/manpages/shorewall-lite.conf.5 2014-06-27 18:39:09.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-lite.conf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/15/2014 +.\" Date: 06/27/2014 .\" Manual: Configuration Files .\" Source: Configuration Files .\" Language: English .\" -.TH "SHOREWALL\-LITE\&.CO" "5" "06/15/2014" "Configuration Files" "Configuration Files" +.TH "SHOREWALL\-LITE\&.CO" "5" "06/27/2014" "Configuration Files" "Configuration Files" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/releasenotes.txt new/shorewall-lite-4.6.1.3/releasenotes.txt --- old/shorewall-lite-4.6.1.1/releasenotes.txt 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/releasenotes.txt 2014-06-27 18:35:53.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 6 . 1 . 1 + S H O R E W A L L 4 . 6 . 1 . 3 ------------------------------------ - J u n e 1 5 , 2 0 1 4 + J u n e 2 5 , 2 0 1 4 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -14,6 +14,32 @@ I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ---------------------------------------------------------------------------- +4.6.1.3 + +1) Use of the 'IfEvent' action resulted in a compilation failure: + + ERROR: -j is only allowed when the ACTION is INLINE with no + parameter /usr/share/shorewall/action.IfEvent (line 139) + from /etc/shorewall/action.SSHKnock (line 8) + from /etc/shorewall/rules (line 31) + +4.6.1.2 + +1) The shorewall-masq(5) and shorewall6-masq(5) manpages had a mangled + heading for the description of the SOURCE column, leading some + readers to assert the that description was missing. + +2) When INLINE_MATCHES=Yes and AUTOHELPERS=No, start or restart could + fail during script execution with this diagnostic: + + Running /sbin/iptables-restore... + Bad argument `helper=netbios-ns' + Error occurred at line: nnn + Try `iptables-restore -h' or 'iptables-restore --help' for more + information. + ERROR: iptables-restore Failed. Input is in + /var/lib/shorewall/.iptables-restore-input + 4.6.1.1 1) An improved error message is generatred when a server address list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/shorewall-lite.spec new/shorewall-lite-4.6.1.3/shorewall-lite.spec --- old/shorewall-lite-4.6.1.1/shorewall-lite.spec 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/shorewall-lite.spec 2014-06-27 18:35:53.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 4.6.1 -%define release 1 +%define release 3 %define initdir /etc/init.d Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. @@ -105,6 +105,10 @@ %doc COPYING changelog.txt releasenotes.txt %changelog +* Sat Jun 21 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-3 +* Fri Jun 20 2014 Tom Eastep tom(a)shorewall.net +- Updated to 4.6.1-2 * Sun Jun 08 2014 Tom Eastep tom(a)shorewall.net - Updated to 4.6.1-1 * Wed Jun 04 2014 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.1.1/uninstall.sh new/shorewall-lite-4.6.1.3/uninstall.sh --- old/shorewall-lite-4.6.1.1/uninstall.sh 2014-06-15 18:17:17.000000000 +0200 +++ new/shorewall-lite-4.6.1.3/uninstall.sh 2014-06-27 18:35:53.000000000 +0200 @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.6.1.1 +VERSION=4.6.1.3 usage() # $1 = exit status { ++++++ shorewall-4.6.1.1.tar.bz2 -> shorewall6-4.6.1.3.tar.bz2 ++++++ ++++ 124657 lines of diff (skipped) ++++++ shorewall-lite-4.6.1.1.tar.bz2 -> shorewall6-lite-4.6.1.3.tar.bz2 ++++++ ++++ 7312 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-viewer for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '14

02 Jul '14

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2014-07-02 15:05:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-viewer" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2014-06-16 21:37:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2014-07-02 15:05:36.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jul 1 13:12:17 MDT 2014 - carnold(a)suse.com + +- Upstream bug fixes + 53970bee-remove-warning-when-removing-display.patch + 53975d94-fix-tiny-windows-for-secondary-displays-in-gtk2-build.patch + 5398b944-take-zoom-level-into-account-for-display-limits.patch + 5398b971-fix-tiny-window-when-resetting-zoom-factor-in-gtk2-build.patch + 53a8716d-fix-un-shrinkable-displays-on-windows-guests.patch + +------------------------------------------------------------------- +Tue Jul 1 16:19:17 UTC 2014 - fcrozat(a)suse.com + +- Switch build to gtk3 for SLE12 and openSUSE 13.2. +- Update windows-keycombo.patch and netware-keycombo.patch to build + with GTK 3. + +------------------------------------------------------------------- New: ---- 53970bee-remove-warning-when-removing-display.patch 53975d94-fix-tiny-windows-for-secondary-displays-in-gtk2-build.patch 5398b944-take-zoom-level-into-account-for-display-limits.patch 5398b971-fix-tiny-window-when-resetting-zoom-factor-in-gtk2-build.patch 53a8716d-fix-un-shrinkable-displays-on-windows-guests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.1Y8X2Y/_old 2014-07-02 15:05:37.000000000 +0200 +++ /var/tmp/diff_new_pack.1Y8X2Y/_new 2014-07-02 15:05:37.000000000 +0200 @@ -16,6 +16,12 @@ # +%if %suse_version >= 1315 +%define gtk_arg --with-gtk=3.0 +%else +%define gtk_arg --with-gtk=2.0 +%endif + Name: virt-viewer Summary: Virtual Machine Viewer License: GPL-2.0+ @@ -35,22 +41,35 @@ Patch9: 5322b929-fix-building-with-older-spice-gtk.patch Patch10: 538df41a-set-freed-variables-to-null.patch Patch11: 5396d3dd-dont-connect-to-localhost-when-using-direct.patch -Patch20: netcat.patch -Patch21: windows-keycombo.patch -Patch22: netware-keycombo.patch -Patch23: report-error.patch -Patch24: virtview-desktop.patch -Patch50: spice-gtk.patch +Patch12: 53970bee-remove-warning-when-removing-display.patch +Patch13: 53975d94-fix-tiny-windows-for-secondary-displays-in-gtk2-build.patch +Patch14: 5398b944-take-zoom-level-into-account-for-display-limits.patch +Patch15: 5398b971-fix-tiny-window-when-resetting-zoom-factor-in-gtk2-build.patch +Patch16: 53a8716d-fix-un-shrinkable-displays-on-windows-guests.patch +Patch50: netcat.patch +Patch51: windows-keycombo.patch +Patch52: netware-keycombo.patch +Patch53: report-error.patch +Patch54: virtview-desktop.patch +Patch55: spice-gtk.patch ExclusiveArch: %ix86 x86_64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake +%if %suse_version >= 1315 +BuildRequires: pkgconfig(gtk+-3.0) +%else BuildRequires: gtk2-devel +%endif BuildRequires: libvirt-devel >= 0.9.7 BuildRequires: libxml2-devel %if %suse_version > 1140 +%if %suse_version >= 1315 +BuildRequires: pkgconfig(gtk-vnc-2.0) +%else BuildRequires: gtk-vnc2-devel %endif +%endif BuildRequires: gtk-vnc-devel >= 0.3.8 BuildRequires: libglade2-devel %if %suse_version > 1130 @@ -84,17 +103,22 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 %build echo "suse_version = %suse_version" %if %suse_version >= 1230 -%configure --with-spice-gtk --with-gtk=2.0 --disable-update-mimedb +%configure --with-spice-gtk %{gtk_arg} --disable-update-mimedb %else %configure --with-gtk=2.0 --disable-update-mimedb GTKVNC_CFLAGS=-I/usr/include/gtk-vnc-1.0 GTKVNC_LIBS=-lgtk-vnc-1.0 %endif ++++++ 53970bee-remove-warning-when-removing-display.patch ++++++ Subject: Remove warning when removing display From: Marc-André Lureau marcandre.lureau(a)redhat.com Tue Jun 10 14:25:16 2014 +0300 Date: Tue Jun 10 15:45:18 2014 +0200: Git: 78c9612257b95ee924ad0b13372106bde3d851f8 Some display have no associated window (for ex, if it doesn't fit on client monitors). (remote-viewer:22275): remote-viewer-CRITICAL **: virt_viewer_window_set_display: assertion `VIRT_VIEWER_IS_WINDOW(self)' failed (remote-viewer:22275): remote-viewer-CRITICAL **: virt_viewer_app_remove_nth_window: assertion `win != NULL' failed https://bugzilla.redhat.com/show_bug.cgi?id=1107518 Index: virt-viewer-0.6.0/src/virt-viewer-app.c =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-app.c +++ virt-viewer-0.6.0/src/virt-viewer-app.c @@ -858,8 +858,10 @@ virt_viewer_app_display_removed(VirtView gtk_widget_hide(GTK_WIDGET(display)); g_object_get(display, "nth-display", &nth, NULL); win = virt_viewer_app_get_nth_window(self, nth); - virt_viewer_window_set_display(win, NULL); + if (!win) + return; + virt_viewer_window_set_display(win, NULL); if (nth != 0) virt_viewer_app_remove_nth_window(self, nth); } ++++++ 53975d94-fix-tiny-windows-for-secondary-displays-in-gtk2-build.patch ++++++ Subject: Fix tiny windows for secondary displays in gtk2 build From: Jonathon Jongsma jjongsma(a)redhat.com Tue Jun 10 11:31:25 2014 -0500 Date: Tue Jun 10 14:33:40 2014 -0500: Git: 6edde57862ac30e74ce6412c93a2fa925ae4ea67 When enabling a new display on linux guests, the new window would be tiny (50x50) and zoomed way out. This was caused by the fact that when the display widget received the 'map' event, it unconditionally cleared the 'dirty' flag, which meant that it would only request 50x50 size. This behavior was intended to fix a bug on the windows client which wprevented windows from resized smaller than the guest display resolution. Unfortunately, due to the timing of the 'map' and allocate events, the widget became very small. Instead of clearing the 'dirty' flag directly when a widget is mapped, we now queue a resize event, which will guarantee that the widget attains its desired size and will then clear its dirty flag (allowing it to be resized). Testing on windows indicates that this fix still solves the 'unshrinkable window' problem while also preventing the tiny secondary display bug. Resolves: rhbz#1104064 Index: virt-viewer-0.6.0/src/virt-viewer-display.c =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-display.c +++ virt-viewer-0.6.0/src/virt-viewer-display.c @@ -441,7 +441,7 @@ virt_viewer_display_map(GtkWidget *widge { GTK_WIDGET_CLASS(virt_viewer_display_parent_class)->map(widget); - virt_viewer_display_make_resizable(VIRT_VIEWER_DISPLAY(widget)); + virt_viewer_display_queue_resize(VIRT_VIEWER_DISPLAY(widget)); } #else ++++++ 5398b944-take-zoom-level-into-account-for-display-limits.patch ++++++ Subject: window: take zoom-level into account for display limits From: Marc-André Lureau marcandre.lureau(a)redhat.com Wed Jun 11 20:56:39 2014 +0300 Date: Wed Jun 11 22:17:08 2014 +0200: Git: d1b2840997f47f0c39c16b6ffc7c2ae5e7934e01 Fixes guest can not be resized to expected window size after zoom out. https://bugzilla.redhat.com/show_bug.cgi?id=1105528 Index: virt-viewer-0.6.0/src/virt-viewer-window.c =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-window.c +++ virt-viewer-0.6.0/src/virt-viewer-window.c @@ -411,8 +411,8 @@ virt_viewer_window_resize(VirtViewerWind int width, height; double desktopAspect; double screenAspect; - guint desktopWidth; - guint desktopHeight; + guint desktopWidth, display_width; + guint desktopHeight, display_height; VirtViewerWindowPrivate *priv = self->priv; if (!priv->auto_resize || priv->fullscreen) @@ -439,8 +439,11 @@ virt_viewer_window_resize(VirtViewerWind desktopAspect = (double)desktopWidth / (double)desktopHeight; screenAspect = (double)fullscreen.width / (double)fullscreen.height; - if ((desktopWidth > fullscreen.width) || - (desktopHeight > fullscreen.height)) { + display_width = desktopWidth * priv->zoomlevel / 100.0; + display_height = desktopHeight * priv->zoomlevel / 100.0; + + if ((display_width > fullscreen.width) || + (display_height > fullscreen.height)) { /* Doesn't fit native res, so go as large as possible maintaining aspect ratio */ if (screenAspect > desktopAspect) { @@ -450,6 +453,8 @@ virt_viewer_window_resize(VirtViewerWind width = fullscreen.width; height = fullscreen.width / desktopAspect; } + width *= 100.0 / priv->zoomlevel; + height *= 100.0 / priv->zoomlevel; } else { width = desktopWidth; height = desktopHeight; ++++++ 5398b971-fix-tiny-window-when-resetting-zoom-factor-in-gtk2-build.patch ++++++ Subject: Fix tiny window when resetting zoom factor in gtk2 build From: Jonathon Jongsma jjongsma(a)redhat.com Wed Jun 11 13:09:30 2014 -0500 Date: Wed Jun 11 15:17:53 2014 -0500: Git: b707b4524ff12ae1c2c3deff0e8c3f0d098f0503 rhbz#1104064 had a couple of symptoms. The first was fixed in 6edde57862ac30e74ce6412c93a2fa925ae4ea67. The second symptom is that displays could also become tiny when clicking 'View > Zoom > Normal Size'. This was because VirtViewerDisplay returned early from _display_set_zoom_level() if the zoom level was being set to the current zoom setting. However, the calling function (_window_set_zoom_level()) also tries to queue a resize event for itself after setting the zoom level on the display. If the display doesn't queue a resize event for itself, its size request will only be 50x50 during the window resize negotiation. This causes the display to become tiny and zoomed out. Queueing a resize on the display widget ensures that it will request the proper size during the next allocation. Index: virt-viewer-0.6.0/src/virt-viewer-display.c =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-display.c +++ virt-viewer-0.6.0/src/virt-viewer-display.c @@ -592,12 +592,19 @@ void virt_viewer_display_set_zoom_level( if (zoom > MAX_ZOOM_LEVEL) zoom = MAX_ZOOM_LEVEL; + // For the gtk2 build, we need to queue a resize even if the zoom level + // hasn't changed. This is due to the fact that VirtViewerWindow will queue + // a resize event for itself immediately after calling this function (in + // order to shrink the window to fit the new display size if necessary). If + // we don't queue a resize here, the window will become tiny because we will + // only request 50x50 during the window resize + virt_viewer_display_queue_resize(display); + if (priv->zoom_level == zoom) return; priv->zoom_level = zoom; - virt_viewer_display_queue_resize(display); g_object_notify(G_OBJECT(display), "zoom-level"); } ++++++ 53a8716d-fix-un-shrinkable-displays-on-windows-guests.patch ++++++ Subject: rhbz#1111514: Fix un-shrinkable displays on windows guests From: Jonathon Jongsma jjongsma(a)redhat.com Fri Jun 20 14:39:12 2014 -0500 Date: Mon Jun 23 13:26:53 2014 -0500: Git: eaaa4f5106a9707e4b9a9cd7b52accde3459333d Commit 6edde5786 introduced a regression wrt shrinking windows on windows guests. This seems to be because resizing a display often causes the notebook widget to switch to the status page temporarily (often so quickly that it's not noticeable to the eye). This causes a quick 'unmap' and 'map' event sequence on the display widget. Apparently the timing of these events varies enough between linux and windows guests that it is only noticeable on windows gueststhe timing of these events varies enough between linux and windows guests that it is only noticeable on windows guests. The exact sequence that causes the bug appears to be as follows: 1 user resizes window smaller 2 display widget gets a new allocation, which causes it to send a display reconfiguration to the guest 3 client receives a new show-hint for the display which causes it to switch temporarily to the 'status' notebook page 4 display widget gets unmapped 5 Client receives another new show-hint, which causes the display widget to get re- mapped, which causes client to send a display reconfiguration to the guest (using the old size) 6 client receives new (smaller, from step 2) display size and temporarily changes to the new size 7 client receives new (larger, from step 5) display size and changes back to original size. To fix the issue, we only explicitly request a resize in response to the very first map event, and for any subsequent map events, we simply call _make_resizable() as before. Index: virt-viewer-0.6.0/src/virt-viewer-display.c =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-display.c +++ virt-viewer-0.6.0/src/virt-viewer-display.c @@ -38,6 +38,7 @@ struct _VirtViewerDisplayPrivate { #if !GTK_CHECK_VERSION(3, 0, 0) gboolean dirty; + gboolean mapped_once; #endif guint desktopWidth; guint desktopHeight; @@ -439,9 +440,16 @@ virt_viewer_display_make_resizable(VirtV static void virt_viewer_display_map(GtkWidget *widget) { + VirtViewerDisplay* self = VIRT_VIEWER_DISPLAY(widget); + GTK_WIDGET_CLASS(virt_viewer_display_parent_class)->map(widget); - virt_viewer_display_queue_resize(VIRT_VIEWER_DISPLAY(widget)); + if (!self->priv->mapped_once) + virt_viewer_display_queue_resize(self); + else + virt_viewer_display_make_resizable(self); + + self->priv->mapped_once = TRUE; } #else ++++++ netware-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.1Y8X2Y/_old 2014-07-02 15:05:37.000000000 +0200 +++ /var/tmp/diff_new_pack.1Y8X2Y/_new 2014-07-02 15:05:37.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-window.c +++ virt-viewer-0.6.0/src/virt-viewer-window.c -@@ -579,6 +579,15 @@ static const struct keyComboDef keyCombo +@@ -584,6 +584,15 @@ static const struct keyComboDef keyCombo { { GDK_Control_L, GDK_Alt_L, GDK_BackSpace, GDK_VoidSymbol }, N_("Ctrl+Alt+_Backspace"), NULL}, { { GDK_Control_R, GDK_Scroll_Lock, GDK_Scroll_Lock, GDK_VoidSymbol }, N_("Ctrl+Scroll+Scroll"), NULL}, { { GDK_VoidSymbol }, "" , NULL}, @@ -18,7 +18,7 @@ { { GDK_Control_L, GDK_Alt_L, GDK_F1, GDK_VoidSymbol }, N_("Ctrl+Alt+F_1"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F2, GDK_VoidSymbol }, N_("Ctrl+Alt+F_2"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F3, GDK_VoidSymbol }, N_("Ctrl+Alt+F_3"), NULL}, -@@ -588,7 +597,7 @@ static const struct keyComboDef keyCombo +@@ -593,7 +602,7 @@ static const struct keyComboDef keyCombo { { GDK_Control_L, GDK_Alt_L, GDK_F7, GDK_VoidSymbol }, N_("Ctrl+Alt+F_7"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F8, GDK_VoidSymbol }, N_("Ctrl+Alt+F_8"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F9, GDK_VoidSymbol }, N_("Ctrl+Alt+F_9"), NULL}, @@ -27,3 +27,25 @@ { { GDK_Control_L, GDK_Alt_L, GDK_F11, GDK_VoidSymbol }, N_("Ctrl+Alt+F11"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F12, GDK_VoidSymbol }, N_("Ctrl+Alt+F12"), NULL}, { { GDK_VoidSymbol }, "" , NULL}, +Index: virt-viewer-0.6.0/src/virt-gtk-compat.h +=================================================================== +--- virt-viewer-0.6.0.orig/src/virt-gtk-compat.h ++++ virt-viewer-0.6.0/src/virt-gtk-compat.h +@@ -35,13 +35,17 @@ G_BEGIN_DECLS + + #if GTK_CHECK_VERSION(3, 0, 0) + #define GDK_Shift_L GDK_KEY_Shift_L ++#define GDK_Shift_R GDK_KEY_Shift_R + #define GDK_VoidSymbol GDK_KEY_VoidSymbol + #define GDK_Control_L GDK_KEY_Control_L + #define GDK_Control_R GDK_KEY_Control_R + #define GDK_Scroll_Lock GDK_KEY_Scroll_Lock + #define GDK_Alt_L GDK_KEY_Alt_L ++#define GDK_Alt_R GDK_KEY_Alt_R + #define GDK_Delete GDK_KEY_Delete + #define GDK_End GDK_KEY_End ++#define GDK_Escape GDK_KEY_Escape ++#define GDK_Tab GDK_KEY_Tab + #define GDK_BackSpace GDK_KEY_BackSpace + #define GDK_Print GDK_KEY_Print + #define GDK_F1 GDK_KEY_F1 ++++++ windows-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.1Y8X2Y/_old 2014-07-02 15:05:37.000000000 +0200 +++ /var/tmp/diff_new_pack.1Y8X2Y/_new 2014-07-02 15:05:37.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-window.c +++ virt-viewer-0.6.0/src/virt-viewer-window.c -@@ -577,6 +577,7 @@ struct keyComboDef { +@@ -582,6 +582,7 @@ struct keyComboDef { static const struct keyComboDef keyCombos[] = { { { GDK_Control_L, GDK_Alt_L, GDK_Delete, GDK_VoidSymbol }, N_("Ctrl+Alt+_Del"), "<virt-viewer>/send/secure-attention"}, { { GDK_Control_L, GDK_Alt_L, GDK_BackSpace, GDK_VoidSymbol }, N_("Ctrl+Alt+_Backspace"), NULL}, @@ -10,3 +10,16 @@ { { GDK_VoidSymbol }, "" , NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F1, GDK_VoidSymbol }, N_("Ctrl+Alt+F_1"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F2, GDK_VoidSymbol }, N_("Ctrl+Alt+F_2"), NULL}, +Index: virt-viewer-0.6.0/src/virt-gtk-compat.h +=================================================================== +--- virt-viewer-0.6.0.orig/src/virt-gtk-compat.h ++++ virt-viewer-0.6.0/src/virt-gtk-compat.h +@@ -37,6 +37,8 @@ G_BEGIN_DECLS + #define GDK_Shift_L GDK_KEY_Shift_L + #define GDK_VoidSymbol GDK_KEY_VoidSymbol + #define GDK_Control_L GDK_KEY_Control_L ++#define GDK_Control_R GDK_KEY_Control_R ++#define GDK_Scroll_Lock GDK_KEY_Scroll_Lock + #define GDK_Alt_L GDK_KEY_Alt_L + #define GDK_Delete GDK_KEY_Delete + #define GDK_End GDK_KEY_End -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vm-install for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '14

02 Jul '14

Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-07-02 15:05:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vm-install" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2014-06-16 21:37:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-07-02 15:05:34.000000000 +0200 @@ -1,0 +2,28 @@ +Mon Jun 30 10:33:44 MDT 2014 - carnold(a)suse.com + +- bnc#870174 - vm-install: Exception AttributeError: "'NoneType' + object has no attribute 'virDomainFree'"... +- Version 0.8.26 + +------------------------------------------------------------------- +Fri Jun 27 10:07:25 MDT 2014 - carnold(a)suse.com + +- Add try/except blocks around xenstore-read to catch failures due + to a corrupt xenstore database +- Updated language files + +------------------------------------------------------------------- +Thu Jun 26 15:22:16 MDT 2014 - carnold(a)suse.com + +- Fix PV VMs starting correctly with no graphics specified +- Fix rhel7 to install correctly. Default to text mode install + for Xen PV rhel7 because the kernel has no framebuffer driver + +------------------------------------------------------------------- +Mon Jun 23 12:10:34 MDT 2014 - carnold(a)suse.com + +- bnc#883901 - sles 12 Xen beta 9 vm-install fails to pxe install + guest with error +- KVM: Fix initializing the use_libvirt flag + +------------------------------------------------------------------- Old: ---- vm-install-0.8.24.tar.bz2 New: ---- vm-install-0.8.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.SpWZ4Q/_old 2014-07-02 15:05:35.000000000 +0200 +++ /var/tmp/diff_new_pack.SpWZ4Q/_new 2014-07-02 15:05:35.000000000 +0200 @@ -27,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.24 +Version: 0.8.26 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0 Group: System/Emulators/PC -Source0: %{name}-0.8.24.tar.bz2 +Source0: %{name}-0.8.26.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x ppc64le ++++++ vm-install-0.8.24.tar.bz2 -> vm-install-0.8.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/Makefile new/vm-install-0.8.26/Makefile --- old/vm-install-0.8.24/Makefile 2014-06-12 05:43:25.000000000 +0200 +++ new/vm-install-0.8.26/Makefile 2014-06-27 01:37:13.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.24 +VER = 0.8.26 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/po/zh_CN.po new/vm-install-0.8.26/po/zh_CN.po --- old/vm-install-0.8.24/po/zh_CN.po 2014-06-12 07:11:46.000000000 +0200 +++ new/vm-install-0.8.26/po/zh_CN.po 2014-06-30 16:21:00.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-08 18:43-0600\n" -"PO-Revision-Date: 2014-06-06 13:52\n" +"PO-Revision-Date: 2014-06-26 12:20\n" "Last-Translator: Novell language <language(a)novell.com>\n" "Language-Team: Novell language <language(a)novell.com>\n" "Language: \n" @@ -581,7 +581,7 @@ #: src/vminstall/msg.py:198 msgid "Password:" -msgstr "密码：" +msgstr "口令：" #: src/vminstall/msg.py:199 msgid "Description" @@ -755,7 +755,7 @@ #: src/vminstall/msg.py:251 msgid "Create a virtual disk based on a device (CD or other block device), an existing image file (ISO), or a new file. Specify a device by its device node, such as /dev/cdrom, not its mount point." -msgstr "基于设备（CD 或其他块设备）、现有映象文件 (ISO) 或新文件创建虚拟磁盘。请根据设备节点（比如，/dev/cdrom）而非装入点来指定设备。" +msgstr "基于设备（CD 或其他块设备）、现有映象文件 (ISO) 或新文件创建虚拟磁盘。请根据设备节点（比如，/dev/cdrom）而非安装点来指定设备。" #: src/vminstall/msg.py:252 msgid "Please specify the settings for the virtual network adapter." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/setup.py new/vm-install-0.8.26/setup.py --- old/vm-install-0.8.24/setup.py 2014-06-12 05:43:40.000000000 +0200 +++ new/vm-install-0.8.26/setup.py 2014-06-27 01:37:09.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.24', + version='0.8.26', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing(a)novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vmdisks/disks.py new/vm-install-0.8.26/src/vmdisks/disks.py --- old/vm-install-0.8.24/src/vmdisks/disks.py 2014-05-29 17:02:43.000000000 +0200 +++ new/vm-install-0.8.26/src/vmdisks/disks.py 2014-06-26 18:20:49.000000000 +0200 @@ -1199,17 +1199,22 @@ return "'%s,%s,%s'" % (self.get_pdev(), vdev, mode) # xl disk config file format: ['target','format','vdev','access','suse-diskcache-disable-flush','backendtype=tap'] proto = self.get_proto() - tap = False - if proto.startswith('tap:'): - proto = proto.split(':')[1] - tap = True + need_backendtype = False if proto == 'file': proto = 'raw' + elif proto.startswith('tap:'): + proto = proto.split(':')[1] + need_backendtype = True + type='tap' + elif proto == 'phy': + proto = 'raw' + need_backendtype = True + type='phy' extra = "" if self._cache_mode == "unsafe": extra = ",suse-diskcache-disable-flush" - if tap: - extra = extra + ",backendtype=tap" + if need_backendtype: + extra = extra + ",backendtype=%s" % type return "'%s,%s,%s,%s%s'" % (self.get_path(), proto, vdev, mode, extra) def __str__(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/ParaVirtGuest.py new/vm-install-0.8.26/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.8.24/src/vminstall/ParaVirtGuest.py 2014-05-12 21:17:49.000000000 +0200 +++ new/vm-install-0.8.26/src/vminstall/ParaVirtGuest.py 2014-06-27 01:42:02.000000000 +0200 @@ -375,7 +375,9 @@ ramdisk = '' if self.runtime['initrd']: ramdisk = ',%s' % self.runtime['initrd'] - if self.options.os_type == "sles12" or self.options.os_type == "sled12": + if self.options.os_type == "sles12" or \ + self.options.os_type == "sled12" or \ + self.options.os_type == "rhel7": return [ "<os type='%s'>" % self.options.os_type, [ '<type>linux</type>', '<kernel>/usr/lib/grub2/x86_64-xen/grub.xen</kernel>', @@ -433,7 +435,10 @@ ramdisk = '' if self.runtime['initrd']: ramdisk = ',%s' % self.runtime['initrd'] - if self.options.use_xl and (self.options.os_type == "sles12" or self.options.os_type == "sled12"): + if self.options.use_xl and \ + (self.options.os_type == "sles12" or \ + self.options.os_type == "sled12" or \ + self.options.os_type == "rhel7"): return """builder="linux" #bootargs="" #extra="%(runtime_args)s %(extra_args)s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/VMLinux.py new/vm-install-0.8.26/src/vminstall/VMLinux.py --- old/vm-install-0.8.24/src/vminstall/VMLinux.py 2013-11-19 00:33:16.000000000 +0100 +++ new/vm-install-0.8.26/src/vminstall/VMLinux.py 2014-06-27 03:20:50.000000000 +0200 @@ -41,8 +41,8 @@ # Fall back to file-globbing (filename may include a version) for ext in exts: for path in ('/boot/', '/'): - # rhel6 uses the pvops kernel - if os_type == 'rhel6': + # rhel6/7 uses the pvops kernel + if os_type == 'rhel6' or os_type == 'rhel7': kernels = glob.glob('%s%svmlinuz-*' % (root, path)) initrds = glob.glob('%s%sinitramfs-*' % (root, path)) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/caps.py new/vm-install-0.8.26/src/vminstall/caps.py --- old/vm-install-0.8.24/src/vminstall/caps.py 2014-06-06 01:18:45.000000000 +0200 +++ new/vm-install-0.8.26/src/vminstall/caps.py 2014-06-30 16:20:24.000000000 +0200 @@ -55,7 +55,10 @@ if domid == '0': continue read_path = '/local/domain/%s/memory/target' % domid - memory = util.run(['/usr/bin/xenstore-read', '-s', read_path]) + try: + memory = util.run(['/usr/bin/xenstore-read', '-s', read_path]) + except: + continue memory = int(memory.strip()) domu_memory = domu_memory + memory / int(512) return domu_memory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/console.py new/vm-install-0.8.26/src/vminstall/console.py --- old/vm-install-0.8.24/src/vminstall/console.py 2014-01-24 03:22:57.000000000 +0100 +++ new/vm-install-0.8.26/src/vminstall/console.py 2014-06-26 22:16:15.000000000 +0200 @@ -199,8 +199,10 @@ """ domid = self.get_domid_from_uuid(guest.uuid) tty = self.get_tty_from_domid(domid) - if tty is None or not os.access(tty, os.R_OK | os.W_OK): + if tty is None: raise NotImplementedError + if not os.access(tty, os.R_OK | os.W_OK): + log.debug("%s may not be accessible, attempting to use anyways" % tty) if os.environ.has_key('DISPLAY'): vmdefaults = VMDefaults[guest.options.os_type] cmd = '/usr/bin/xterm' @@ -212,7 +214,7 @@ if util.is_xend_running(): args.extend(['-T', guest.options.name, '-e', 'xm', 'console', guest.uuid]) else: - args.extend(['-T', guest.options.name, '-e', 'xl', 'console', domid]) + args.extend(['-T', guest.options.name, '-e', 'xl', 'console', str(domid)]) log.info("Opened a console in an xterm.") else: if caps.is_kvm() or caps.is_qemu(): @@ -224,7 +226,7 @@ args = ['/usr/sbin/xm', 'console', guest.uuid ] else: cmd = '/usr/sbin/xl' - args = ['/usr/sbin/xl', 'console', domid ] + args = ['/usr/sbin/xl', 'console', str(domid)] log.debug("Running: %s" % str(args)) if not detach: pid = os.fork() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/job.py new/vm-install-0.8.26/src/vminstall/job.py --- old/vm-install-0.8.24/src/vminstall/job.py 2014-05-15 19:08:58.000000000 +0200 +++ new/vm-install-0.8.26/src/vminstall/job.py 2014-06-30 18:33:15.000000000 +0200 @@ -292,6 +292,9 @@ self._state_num = Job.FAILED self._update_job_file() raise + finally: + if hypervisor.connection: + del hypervisor.connection def _handle_cancel_signal(self, signum, frame): log.debug("handle_cancel_signal") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/libvirt_console.py new/vm-install-0.8.26/src/vminstall/libvirt_console.py --- old/vm-install-0.8.24/src/vminstall/libvirt_console.py 2014-05-15 15:26:35.000000000 +0200 +++ new/vm-install-0.8.26/src/vminstall/libvirt_console.py 2014-06-30 16:20:24.000000000 +0200 @@ -17,6 +17,8 @@ from log import log import vminstall import threading +import util +import caps import time import libvirt @@ -70,7 +72,14 @@ def get_tty_from_domid(self, domid): if domid is None: return None - tty = None + if caps.is_xen(): + console_path = '/local/domain/%d/console/tty' % domid + try: + tty = util.run(['/usr/bin/xenstore-read', '-s', console_path]) + except: + return None + log.info('Domain ID %d has tty %s' % (domid, str(tty))) + return tty # We can avoid xenstore entirely virConn = vminstall.hypervisor.connection.getconn() if virConn: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/options.py new/vm-install-0.8.26/src/vminstall/options.py --- old/vm-install-0.8.24/src/vminstall/options.py 2014-04-03 15:35:55.000000000 +0200 +++ new/vm-install-0.8.26/src/vminstall/options.py 2014-06-26 22:03:21.000000000 +0200 @@ -424,6 +424,8 @@ defaults.connect = xen_hypervisor.Xend(None) defaults.use_libvirt = options.use_libvirt = False hypervisor.connection = defaults.connect + elif defaults.use_libvirt is None and not defaults.use_xl: + defaults.use_libvirt = options.use_libvirt = hypervisor.connection.use_libvirt old_os_type = defaults.os_type if options.os_type: @@ -642,7 +644,11 @@ else: defaults.graphics = 'cirrus' else: - defaults.graphics = 'para' + # Rhel7 kernel doesn't have framebuffer device built in kernel + if options.graphics is None and options.os_type == "rhel7": + options.graphics = defaults.graphics = 'none' + else: + defaults.graphics = 'para' if options.screen_resolution: defaults.screen_resolution = options.screen_resolution diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.24/src/vminstall/xl_console.py new/vm-install-0.8.26/src/vminstall/xl_console.py --- old/vm-install-0.8.24/src/vminstall/xl_console.py 2014-01-24 03:22:57.000000000 +0100 +++ new/vm-install-0.8.26/src/vminstall/xl_console.py 2014-06-30 16:20:24.000000000 +0200 @@ -52,11 +52,17 @@ if domid == '0': continue read_path = '/local/domain/%s/vm' % domid - path = util.run(['/usr/bin/xenstore-read', '-s', read_path]) + try: + path = util.run(['/usr/bin/xenstore-read', '-s', read_path]) + except: + return None path = path.strip() if path == vm_path: read_path = '/local/domain/%s/domid' % domid - d = util.run(['/usr/bin/xenstore-read', '-s', read_path]) + try: + d = util.run(['/usr/bin/xenstore-read', '-s', read_path]) + except: + continue if d == 'None': continue domid = int(domid) @@ -82,7 +88,10 @@ return None tty = None console_path = '/local/domain/%d/console/tty' % domid - tty = util.run(['/usr/bin/xenstore-read', '-s', console_path]) + try: + tty = util.run(['/usr/bin/xenstore-read', '-s', console_path]) + except: + return None log.info('Domain ID %d has tty %s' % (domid, str(tty))) return tty @@ -112,7 +121,11 @@ log.debug("Watch fired for '%s'" % uuid_path) cv.acquire() #u = xstransact.Read(uuid_path) - u = util.run(['/usr/bin/xenstore-read', '-s', uuid_path]) + try: + u = util.run(['/usr/bin/xenstore-read', '-s', uuid_path]) + except: + cv.release() + return u = u.strip() log.debug("UUID is '%s'", u) if u is None: @@ -153,10 +166,13 @@ console_path = '/local/domain/%d/console/vnc-port' % domid console_path = console_path.strip() for _ in xrange(10): - p = util.run(['/usr/bin/xenstore-read', '-s', console_path]) - p = p.strip() - if p is not None: - return int(p) + try: + p = util.run(['/usr/bin/xenstore-read', '-s', console_path]) + p = p.strip() + if p is not None: + return int(p) + except: + pass time.sleep(1) return None -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libtorrent-rasterbar for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '14

02 Jul '14

Hello community, here is the log from the commit of package libtorrent-rasterbar for openSUSE:Factory checked in at 2014-07-02 15:05:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtorrent-rasterbar (Old) and /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libtorrent-rasterbar" Changes: -------- --- /work/SRC/openSUSE:Factory/libtorrent-rasterbar/libtorrent-rasterbar.changes 2014-03-31 20:43:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new/libtorrent-rasterbar.changes 2014-07-02 15:05:32.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jul 1 18:13:14 UTC 2014 - fisiu(a)opensuse.org + +- Update to 0.16.17: + * don't fall back on wildcard port in UPnP + * fix local service discovery for magnet links + * fix bitfield issue in file_storage + * added work-around for MingW issue in file I/O + * fixed sparse file detection on windows + * fixed bug in gunzip + * fix to use proxy settings when adding .torrent file from URL + * fix resume file issue related to daylight savings time on windows + * improve error checking in lazy_bdecode + +------------------------------------------------------------------- Old: ---- libtorrent-rasterbar-0.16.16.tar.gz New: ---- libtorrent-rasterbar-0.16.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtorrent-rasterbar.spec ++++++ --- /var/tmp/diff_new_pack.5KEQOP/_old 2014-07-02 15:05:33.000000000 +0200 +++ /var/tmp/diff_new_pack.5KEQOP/_new 2014-07-02 15:05:33.000000000 +0200 @@ -23,7 +23,7 @@ %bcond_with examples Name: libtorrent-rasterbar -Version: 0.16.16 +Version: 0.16.17 Release: 0 Summary: Libtorrent is a C++ implementation of the BitTorrent protocol License: BSD-3-Clause ++++++ libtorrent-rasterbar-0.16.16.tar.gz -> libtorrent-rasterbar-0.16.17.tar.gz ++++++ ++++ 1957 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0