Skip to content
Snippets Groups Projects
Commit 6a723214 authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Merge branch '8-v2-xsane-et-al-snprintf-under-artistic' into 'belenos'

8 v2 correct xsane et al snprintf under artistic

xsane, sane-frontends, sane-backends, and sane-backends-extras all use slightly different local snprintf s drawn from an old release of LPRng which are under the Artistic License.  The autoconf setup isn't good enough to detect and use the system snprintf.

The problem was also reported to Fedora and as per spotrh's comment in User Issue 10713 they solved the problem by refactoring the more recent and acceptably licensed snprintf.c from current LPRng. Which they have sent to Sane.  The xsane patch spotrh provided was used to reconstruct this and rather than manage four patches these four essentially identical helper commits copy this over the existing file and update debian/copyright with a shim.  The shim is kept in DATA/blah with the new file for clarity of licensing of the code.

See merge request !12
parents 95552125 6aa595c4
No related branches found
No related tags found
No related merge requests found
----------------------------------
Files: lib/snprintf.c
Copyright: 1993-2004 Patrick Powell, San Diego, CA <papowell@lprng.com>
License: GPL2+ with OpenSSL exception or Artistic License
License: GPL2+ with OpenSSL exception
.
*LPRng, IFHP, and LPRngTool LICENSE*
GNU GPL and Artistic License
.
(Version 5, 28 Aug 2003)
.
Copyright Patrick Powell, Astart Technologies
<papowell@lprng.com>
.
All rights reserved.
.
You may use "LPRng" or "IFHP" under either the terms of the GNU
GPL License or the Artistc License. These licenses are included
below. The licenses were obtained from the http://www.opensource.org
web site on 28 Aug 2003.
.
These Licenses apply to the computer software packages known as
"LPRng", "IFHP", and associated files. The "Package" or "Program"
below refers to the programs, files, and associated software which
are distributed as the package.
.
The "LPRng" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "IFHP" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "LPRngTool" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND ALL
ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE
PROGRAM OR WORKS BASED ON IT. NOTHING OTHER THAN THIS LICENSE GRANTS
YOU PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE
WORKS. THESE ACTIONS ARE PROHIBITED BY LAW. IF YOU DO NOT ACCEPT THESE
TERMS AND CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE PROGRAM.
.
-----------------------------------------------------------------------
Addendum Fri Jun 21 17:06:33 PDT 2002
.
If you wish to distribute the LPRng source code or binaries of any
of the programs in the LPRng packages under terms of the GNU license,
then when any package or portion of the LPRng is configured to use
any facility or utility of the OpenSSL distribution, the additional
following clause will be applied, as recommended in the OpenSSL
0.9.6c release FAQ:
.
"This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed."
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
License: Artistic-1.0
The complete text of the Artistic License
can be found in /usr/share/common-licenses/Artistic file.
This diff is collapsed.
----------------------------------
Files: lib/snprintf.c
Copyright: 1993-2004 Patrick Powell, San Diego, CA <papowell@lprng.com>
License: GPL2+ with OpenSSL exception or Artistic License
License: GPL2+ with OpenSSL exception
.
*LPRng, IFHP, and LPRngTool LICENSE*
GNU GPL and Artistic License
.
(Version 5, 28 Aug 2003)
.
Copyright Patrick Powell, Astart Technologies
<papowell@lprng.com>
.
All rights reserved.
.
You may use "LPRng" or "IFHP" under either the terms of the GNU
GPL License or the Artistc License. These licenses are included
below. The licenses were obtained from the http://www.opensource.org
web site on 28 Aug 2003.
.
These Licenses apply to the computer software packages known as
"LPRng", "IFHP", and associated files. The "Package" or "Program"
below refers to the programs, files, and associated software which
are distributed as the package.
.
The "LPRng" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "IFHP" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "LPRngTool" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND ALL
ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE
PROGRAM OR WORKS BASED ON IT. NOTHING OTHER THAN THIS LICENSE GRANTS
YOU PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE
WORKS. THESE ACTIONS ARE PROHIBITED BY LAW. IF YOU DO NOT ACCEPT THESE
TERMS AND CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE PROGRAM.
.
-----------------------------------------------------------------------
Addendum Fri Jun 21 17:06:33 PDT 2002
.
If you wish to distribute the LPRng source code or binaries of any
of the programs in the LPRng packages under terms of the GNU license,
then when any package or portion of the LPRng is configured to use
any facility or utility of the OpenSSL distribution, the additional
following clause will be applied, as recommended in the OpenSSL
0.9.6c release FAQ:
.
"This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed."
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
License: Artistic-1.0
The complete text of the Artistic License
can be found in /usr/share/common-licenses/Artistic file.
This diff is collapsed.
----------------------------------
Files: lib/snprintf.c
Copyright: 1993-2004 Patrick Powell, San Diego, CA <papowell@lprng.com>
License: GPL2+ with OpenSSL exception or Artistic License
License: GPL2+ with OpenSSL exception
.
*LPRng, IFHP, and LPRngTool LICENSE*
GNU GPL and Artistic License
.
(Version 5, 28 Aug 2003)
.
Copyright Patrick Powell, Astart Technologies
<papowell@lprng.com>
.
All rights reserved.
.
You may use "LPRng" or "IFHP" under either the terms of the GNU
GPL License or the Artistc License. These licenses are included
below. The licenses were obtained from the http://www.opensource.org
web site on 28 Aug 2003.
.
These Licenses apply to the computer software packages known as
"LPRng", "IFHP", and associated files. The "Package" or "Program"
below refers to the programs, files, and associated software which
are distributed as the package.
.
The "LPRng" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "IFHP" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "LPRngTool" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND ALL
ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE
PROGRAM OR WORKS BASED ON IT. NOTHING OTHER THAN THIS LICENSE GRANTS
YOU PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE
WORKS. THESE ACTIONS ARE PROHIBITED BY LAW. IF YOU DO NOT ACCEPT THESE
TERMS AND CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE PROGRAM.
.
-----------------------------------------------------------------------
Addendum Fri Jun 21 17:06:33 PDT 2002
.
If you wish to distribute the LPRng source code or binaries of any
of the programs in the LPRng packages under terms of the GNU license,
then when any package or portion of the LPRng is configured to use
any facility or utility of the OpenSSL distribution, the additional
following clause will be applied, as recommended in the OpenSSL
0.9.6c release FAQ:
.
"This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed."
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
License: Artistic-1.0
The complete text of the Artistic License
can be found in /usr/share/common-licenses/Artistic file.
This diff is collapsed.
----------------------------------
Files: lib/snprintf.c
Copyright: 1993-2004 Patrick Powell, San Diego, CA <papowell@lprng.com>
License: GPL2+ with OpenSSL exception or Artistic License
License: GPL2+ with OpenSSL exception
.
*LPRng, IFHP, and LPRngTool LICENSE*
GNU GPL and Artistic License
.
(Version 5, 28 Aug 2003)
.
Copyright Patrick Powell, Astart Technologies
<papowell@lprng.com>
.
All rights reserved.
.
You may use "LPRng" or "IFHP" under either the terms of the GNU
GPL License or the Artistc License. These licenses are included
below. The licenses were obtained from the http://www.opensource.org
web site on 28 Aug 2003.
.
These Licenses apply to the computer software packages known as
"LPRng", "IFHP", and associated files. The "Package" or "Program"
below refers to the programs, files, and associated software which
are distributed as the package.
.
The "LPRng" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "IFHP" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
The "LPRngTool" Software Package is a copyrighted work whose copyright
is held by Patrick Powell.
.
BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND ALL
ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE
PROGRAM OR WORKS BASED ON IT. NOTHING OTHER THAN THIS LICENSE GRANTS
YOU PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE
WORKS. THESE ACTIONS ARE PROHIBITED BY LAW. IF YOU DO NOT ACCEPT THESE
TERMS AND CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE PROGRAM.
.
-----------------------------------------------------------------------
Addendum Fri Jun 21 17:06:33 PDT 2002
.
If you wish to distribute the LPRng source code or binaries of any
of the programs in the LPRng packages under terms of the GNU license,
then when any package or portion of the LPRng is configured to use
any facility or utility of the OpenSSL distribution, the additional
following clause will be applied, as recommended in the OpenSSL
0.9.6c release FAQ:
.
"This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed."
.
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
License: Artistic-1.0
The complete text of the Artistic License
can be found in /usr/share/common-licenses/Artistic file.
This diff is collapsed.
#!/bin/sh
#
# Copyright (C) 2014 Andrew M. Lindley <andrew@andrewlindley.co.uk>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
cp $DATA/snprintf.c ./lib/
cat $DATA/copyright.snprintf >> debian/copyright
changelog "Replace non-free snprintf #10713"
compile
#!/bin/sh
#
# Copyright (C) 2014 Andrew M. Lindley <andrew@andrewlindley.co.uk>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
cp $DATA/snprintf.c ./lib/
cat $DATA/copyright.snprintf >> debian/copyright
changelog "Replace non-free snprintf #11795"
compile
#!/bin/sh
#
# Copyright (C) 2014 Andrew M. Lindley <andrew@andrewlindley.co.uk>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
cp $DATA/snprintf.c ./lib/
cat $DATA/copyright.snprintf >> debian/copyright
changelog "Replace non-free snprintf #10793"
compile
#!/bin/sh
#
# Copyright (C) 2014 Andrew M. Lindley <andrew@andrewlindley.co.uk>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
cp $DATA/snprintf.c ./lib/
cat $DATA/copyright.snprintf >> debian/copyright
changelog "Replace non-free snprintf #10794"
compile
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment