Skip to contentSkip to conversation

Current Groff is really GPLv3!

PATCH New Saul Wold 1 participant 3 messages Aug 9, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Current Groff is really GPLv3!

Turns out that a groff update was done sometime ago, and while committer noted the license checksum changed, they did not verify the true nature of the change. I caught this by total chance looking at the license manifest directory.

Saul Wold (2):
groff: Add GPLv2 version
groff: Fix License to be GPLv3

 .../groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch | 35 ++++++++++++++++
 .../groff/groff-1.18.1.4/man-local.patch           | 32 +++++++++++++++
 .../groff/groff-1.18.1.4/mdoc-local.patch          | 31 +++++++++++++++
 meta/recipes-extended/groff/groff_1.18.1.4.bb      | 46 ++++++++++++++++++++++
 meta/recipes-extended/groff/groff_1.22.2.bb        |  2 +-
 5 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
 create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
 create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
 create mode 100644 meta/recipes-extended/groff/groff_1.18.1.4.bb
Signature · 1 line
1.8.1.4
author
#1 lore raw

PATCH 1/2 groff: Add GPLv2 version

Apparrently a LICENSE change was missed, so we add the GPLv2 version back in

---
 .../groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch | 35 ++++++++++++++++
 .../groff/groff-1.18.1.4/man-local.patch           | 32 +++++++++++++++
 .../groff/groff-1.18.1.4/mdoc-local.patch          | 31 +++++++++++++++
 meta/recipes-extended/groff/groff_1.18.1.4.bb      | 46 ++++++++++++++++++++++
 4 files changed, 144 insertions(+)
 create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
 create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
 create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
 create mode 100644 meta/recipes-extended/groff/groff_1.18.1.4.bb
meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch new file +35 -0
new file mode 100644
index 0000000..90ad8e3
@@ -0,0 +1,35 @@
+---
+ groff-1.18.1.4/Makefile.in |    7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -460,27 +460,22 @@ OTHERDIRS=\
+   src/roff/grog \
+   src/roff/nroff \
+   contrib/mm \
+   contrib/pic2graph \
+   contrib/eqn2graph \
+-  contrib/groffer \
+-  contrib/mom \
+-  doc
++  contrib/groffer
+ ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
+   $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+ EXTRADIRS=\
+   font/devps/generate \
+   font/devdvi/generate \
+   font/devlj4/generate \
+-  src/xditview \
+   doc
+ NOMAKEDIRS=\
+   arch/djgpp \
+   contrib/mm/examples \
+   contrib/mm/mm \
+-  contrib/mom/examples \
+-  contrib/mom/momdoc \
+   src/libs/snprintf
+ DISTDIRS=\
+   $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDEVDIRS) \
+   $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
+ TARGETS=all install install_bin install_data clean distclean mostlyclean \
meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch new file +32 -0
new file mode 100644
index 0000000..34b4248
@@ -0,0 +1,32 @@
+Index: groff-1.18.1.4/tmac/man.local
+===================================================================
+--- groff-1.18.1.4.orig/tmac/man.local	2000-10-26 22:15:17.000000000 +0800
++++ groff-1.18.1.4/tmac/man.local	2010-08-24 14:17:52.070006664 +0800
+@@ -1,2 +1,27 @@
+ .\" This file is loaded after an-old.tmac.
+ .\" Put any local modifications to an-old.tmac here.
++.
++.if n \{\
++.  \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
++.  \" than utf8.
++.  if !'\*[.T]'utf8' \
++.    tr \[oq]'
++.
++.  \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
++.  \" grotty.
++.  if '\V[GROFF_SGR]'' \
++.    output x X tty: sgr 0
++.
++.  \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
++.  \" searching in man pages easier.
++.  if '\*[.T]'utf8' \
++.    char \- \N'45'
++.
++.  \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
++.  \" as those in command-line options. This is a bug in those pages, but
++.  \" too many fonts are missing the Unicode HYPHEN character, so we render
++.  \" this as the ASCII-compatible HYPHEN-MINUS instead.
++.  if '\*[.T]'utf8' \
++.    char - \N'45'
++.\}
++
meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch new file +31 -0
new file mode 100644
index 0000000..140a544
@@ -0,0 +1,31 @@
+Index: groff-1.18.1.4/tmac/mdoc.local
+===================================================================
+--- groff-1.18.1.4.orig/tmac/mdoc.local	2001-03-23 08:17:51.000000000 +0800
++++ groff-1.18.1.4/tmac/mdoc.local	2010-08-24 14:20:22.014006846 +0800
+@@ -1,2 +1,26 @@
+ .\" This file is loaded after doc.tmac.
+ .\" Put any local modifications to doc.tmac here.
++.
++.if n \{\
++.  \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
++.  \" than utf8.
++.  if !'\*[.T]'utf8' \
++.    tr \[oq]'
++.
++.  \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
++.  \" grotty.
++.  if '\V[GROFF_SGR]'' \
++.    output x X tty: sgr 0
++.
++.  \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
++.  \" searching in man pages easier.
++.  if '\*[.T]'utf8' \
++.    char \- \N'45'
++.
++.  \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
++.  \" as those in command-line options. This is a bug in those pages, but
++.  \" too many fonts are missing the Unicode HYPHEN character, so we render
++.  \" this as the ASCII-compatible HYPHEN-MINUS instead.
++.  if '\*[.T]'utf8' \
++.    char - \N'45'
++.\}
meta/recipes-extended/groff/groff_1.18.1.4.bb new file +46 -0

46 lines not on this page · raw message

Signature · 1 line
1.8.1.4
author
#2 lore raw

PATCH 2/2 groff: Fix License to be GPLv3

In reply to Saul Wold
---
 meta/recipes-extended/groff/groff_1.22.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/groff/groff_1.22.2.bb +1 -1
index dc964ae..9d2a3c7 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "The groff (GNU troff) software is a typesetting package which rea
 formatting commands and produces formatted output."
 SECTION = "base"
 HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
-LICENSE = "GPLv2"
+LICENSE = "GPLv3"
 PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
Signature · 1 line
1.8.1.4