[PATCH 1/2] update FSF address in license text

[PATCH 1/2] update FSF address in license text

[Jiri Popelka]

http://www.gnu.org/licenses/gpl-2.0.html
http://www.fsf.org/about/contact/
---
 extensions/libxt_CONNMARK.c      | 2 +-
 extensions/libxt_connmark.c      | 2 +-
 extensions/libxt_osf.c           | 2 +-
 include/linux/netfilter/xt_osf.h | 2 +-
 libxtables/xtables.c             | 2 +-
 utils/nfnl_osf.c                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c
index 5d5351e..42cf207 100644
--- a/extensions/libxt_CONNMARK.c
+++ b/extensions/libxt_CONNMARK.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c
index 6f1d532..95477de 100644
--- a/extensions/libxt_connmark.c
+++ b/extensions/libxt_connmark.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/extensions/libxt_osf.c b/extensions/libxt_osf.c
index 52dba47..496b480 100644
--- a/extensions/libxt_osf.c
+++ b/extensions/libxt_osf.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 /*
diff --git a/include/linux/netfilter/xt_osf.h b/include/linux/netfilter/xt_osf.h
index 18afa49..d0c4c76 100644
--- a/include/linux/netfilter/xt_osf.h
+++ b/include/linux/netfilter/xt_osf.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #ifndef _XT_OSF_H
diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index a511c08..1ab86d5 100644
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -13,7 +13,7 @@
  *
  *	You should have received a copy of the GNU General Public License
  *	along with this program; if not, write to the Free Software
- *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 #include "config.h"
 #include <ctype.h>
diff --git a/utils/nfnl_osf.c b/utils/nfnl_osf.c
index bb5f92d..645ec64 100644
--- a/utils/nfnl_osf.c
+++ b/utils/nfnl_osf.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include <sys/types.h>
-- 
1.8.5.3

[PATCH 2/2] iptables: missing bracket in iptables-save(8)

[Jiri Popelka]

---
 iptables/iptables-save.8.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iptables/iptables-save.8.in b/iptables/iptables-save.8.in
index 5e939b1..6128280 100644
--- a/iptables/iptables-save.8.in
+++ b/iptables/iptables-save.8.in
@@ -27,7 +27,7 @@ ip6tables-save \(em dump iptables rules to stdout
 [\fB\-t\fP \fItable\fP]
 .P
 \fBip6tables\-save\fP [\fB\-M\fP \fImodprobe\fP] [\fB\-c\fP]
-[\fB\-t\fP \fItable\fP
+[\fB\-t\fP \fItable\fP]
 .SH DESCRIPTION
 .PP
 .B iptables-save
-- 
1.8.5.3

Re: [PATCH 2/2] iptables: missing bracket in iptables-save(8)

[Pablo Neira Ayuso]

Also applied, thanks.

Re: [PATCH 1/2] update FSF address in license text

[Pablo Neira Ayuso]

On Thu, Mar 13, 2014 at 10:02:13AM +0100, Jiri Popelka wrote:
> http://www.gnu.org/licenses/gpl-2.0.html
> http://www.fsf.org/about/contact/

Applied, thanks Jiri.