From d0f10b314dca7c6929b6fe8fa4cb5af10bcf8c2d Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Thu, 21 Jan 2016 15:33:11 +0100 Subject: added debian folder from official debian package updated debian patches new release Signed-off-by: Wolfgang Wiedmeyer --- debian/cgit.apache2 | 1 + debian/cgit.dirs | 2 + debian/cgit.install | 1 + debian/cgit.lintian-overrides | 2 + debian/cgit.manpages | 1 + debian/cgitrc | 7 + debian/changelog | 38 ++ debian/compat | 1 + debian/control | 43 ++ debian/copyright | 432 +++++++++++++++++++++ debian/patches/Use-debian-binary-name-rst2html | 17 + debian/patches/add-highlighting-rules-to-cgit.css | 31 ++ .../assume-highlight-version-3-in-filter-script | 20 + debian/patches/debianize_makefile | 18 + debian/patches/hardening | 13 + debian/patches/series | 9 + debian/rules | 53 +++ debian/source/format | 2 + debian/source/lintian-overrides | 2 + debian/source/local-options | 3 + 20 files changed, 696 insertions(+) create mode 100644 debian/cgit.apache2 create mode 100644 debian/cgit.dirs create mode 100644 debian/cgit.install create mode 100644 debian/cgit.lintian-overrides create mode 100644 debian/cgit.manpages create mode 100644 debian/cgitrc create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/patches/Use-debian-binary-name-rst2html create mode 100644 debian/patches/add-highlighting-rules-to-cgit.css create mode 100644 debian/patches/assume-highlight-version-3-in-filter-script create mode 100644 debian/patches/debianize_makefile create mode 100644 debian/patches/hardening create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/source/lintian-overrides create mode 100644 debian/source/local-options diff --git a/debian/cgit.apache2 b/debian/cgit.apache2 new file mode 100644 index 0000000..bc27e79 --- /dev/null +++ b/debian/cgit.apache2 @@ -0,0 +1 @@ +conf debian/cgit.conf diff --git a/debian/cgit.dirs b/debian/cgit.dirs new file mode 100644 index 0000000..3f612ea --- /dev/null +++ b/debian/cgit.dirs @@ -0,0 +1,2 @@ +/usr/lib/cgit +/var/cache/cgit diff --git a/debian/cgit.install b/debian/cgit.install new file mode 100644 index 0000000..17d3063 --- /dev/null +++ b/debian/cgit.install @@ -0,0 +1 @@ +debian/cgitrc /etc diff --git a/debian/cgit.lintian-overrides b/debian/cgit.lintian-overrides new file mode 100644 index 0000000..cc57e29 --- /dev/null +++ b/debian/cgit.lintian-overrides @@ -0,0 +1,2 @@ +cgit: python-script-but-no-python-dep usr/lib/cgit/filters/syntax-highlighting.py +cgit: python-script-but-no-python-dep usr/lib/cgit/filters/email-gravatar.py diff --git a/debian/cgit.manpages b/debian/cgit.manpages new file mode 100644 index 0000000..c28066c --- /dev/null +++ b/debian/cgit.manpages @@ -0,0 +1 @@ +cgitrc.5 diff --git a/debian/cgitrc b/debian/cgitrc new file mode 100644 index 0000000..afaab15 --- /dev/null +++ b/debian/cgitrc @@ -0,0 +1,7 @@ +# +# cgit config +# see cgitrc(5) for details + +css=/cgit-css/cgit.css +logo=/cgit-css/cgit.png + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a42ef6a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,38 @@ +cgit (0.12.0.git2.7.0-1) jessie-add; urgency=medium + + * upstream version from master + * updated debian patches + + -- Wolfgang Wiedmeyer Thu, 21 Jan 2016 14:24:03 +0100 + +cgit (0.11.2.git2.3.2-1) unstable; urgency=medium + + * [7f8779f] Imported Upstream version 0.11.2.git2.3.2 + Closes: #781299 + * [3925a1b] Refresh patches + * [bb17f35] Refresh git tree + * [74e06fe] Bump standards version + * [778309b] Use debians rst2html and hilight 3.x (Closes: #765806) + * [33c654c] ship cache directory (Closes: #784608) + + -- Alexander Wirt Tue, 11 Aug 2015 10:24:03 +0200 + +cgit (0.10.2.git2.0.1-3) unstable; urgency=medium + + * Initial upload + + -- Alexander Wirt Thu, 28 Aug 2014 16:26:24 -0700 + +cgit (0.10.2.git2.0.1-2) unstable; urgency=medium + + [ Nicolas Dandrimont ] + * [c7b31d2] Return a 404 status code when a repo doesn't exist + * [c8837ea] Add missing b-d for tests + + -- Alexander Wirt Fri, 01 Aug 2014 06:58:39 +0200 + +cgit (0.10.2.git2.0.1-1) unstable; urgency=low + + * Initial packaging. + + -- Alexander Wirt Fri, 01 Aug 2014 06:58:19 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a045a91 --- /dev/null +++ b/debian/control @@ -0,0 +1,43 @@ +Source: cgit +Section: net +Priority: extra +Maintainer: Alexander Wirt +Build-Depends: asciidoc, + debhelper (>=9), + dh-apache2, + docbook-xsl, + git, + liblua5.1-0-dev, + libssl-dev, + libxml2-utils, + pkg-config, + tidy, + unzip, + xmlto +Standards-Version: 3.9.6 +Homepage: http://git.zx2c4.com/cgit/ + +Package: cgit +Architecture: any +Multi-Arch: foreign +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} +Recommends: python, ${misc:Recommends} +Description: hyperfast web frontend for git repositories written in C + This is an attempt to create a fast web interface for the Git SCM, using a + built-in cache to decrease server I/O pressure. + . + Features: + * basic repository browsing (logs, diffs, trees...) + * caching of generated HTML + * cloneable URLs (implements dumb HTTP transport) + * commit feeds (atom format) + * discovery of Git repositories + * on-the-fly archives for tags and commits + * plugin support for e.g. syntax highlighting + * side-by-side diffs + * simple time/author statistics + * simple virtual hosting support (macro expansion) + * understands GitWeb project-lists + * understands gitweb.owner in Git config files + * has extensive filtering framework using scripts or a built-in lua + interpreter diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c1d8423 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,432 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cgit +Source: + +Files: * +Copyright: © 2006-2014 cgit Development Team +License: GPL-2 + +Files: debian/* +Copyright: © 2014 Alexander Wirt +License: GPL-2 + +Files: git/* +Copyright: © 2005-2014, Linus Torvalds and others. +License: GPL-2 + +Files: git/xdiff/* +Copyright: © 2003-2009, Davide Libenzi, Johannes E. Schindelin +License: LGPL-2.1+ + +Files: git/xdiff/xhistogram.c +Copyright: © 2010, Google Inc. + and other copyright owners as documented in JGit's IP log. +License: EDL-1.0 + +Files: git/ewah/* +Copyright: © 2013, GitHub Inc. + © 2009-2013, Daniel Lemire, Cliff Moon, + David McIntosh, Rober Becho, Google Inc. and Veronika Zenz +License: GPL-2+ + +Files: git/gitk-git/* +Copyright: © 2005-2014, Paul Mackerras, et al. +License: GPL-2+ + +Files: git/gitk-git/po/bg.po +Copyright: © 2014, Alexander Shopov +License: GPL-2 +Comment: This file is distributed under the same license as the git package. + +Files: git/git-gui/* +Copyright: © 2005-2010, Shawn Pearce, et. al. +License: GPL-2+ + +Files: git/git-gui/po/bg.po git/git-gui/po/de.po git/git-gui/po/fr.po git/git-gui/po/glossary/* +Copyright: © 2007-2008, Shawn Pearce, et al. + © 2012-2014, Alexander Shopov +License: GPL-2 +Comment: This file is distributed under the same license as the git package. + +Files: git/git-gui/po/glossary/el.po git/git-gui/po/glossary/pt_br.po +Copyright: © 2007, Shawn Pearce, et al. + © 2009, Jimmy Angelakos +License: GPL-2+ +Comment: This file is distributed under the same license as the git-gui package. + +Files: git/gitweb/static/js/* +Copyright: © 2007, Fredrik Kuivinen + © 2007, Petr Baudis + © 2008-2011, Jakub Narebski + © 2011, John 'Warthog9' Hawley +License: GPL-2+ + +Files: git/git-p4 +Copyright: © 2007, Simon Hausmann + © 2007, Trolltech ASA +License: Expat + +Files: git/git-svn.perl +Copyright: © 2006, Eric Wong +License: GPL-2+ + +Files: git/vcs-svn/* +Copyright: © 2010, David Barr + © 2010, Jonathan Nieder + © 2005, Stefan Hegny, hydrografix Consulting GmbH, + Frankfurt/Main, Germany + and others, see http://svn2cc.sarovar.org +License: BSD-2-clause + +Files: git/imap-send.c +Copyright: © 2000-2002, Michael R. Elkins + © 2002-2004, Oswald Buddenhagen + © 2004, Theodore Y. Ts'o + © 2006, Mike McCormack +Name: git-imap-send - drops patches into an imap Drafts folder + derived from isync/mbsync - mailbox synchronizer +License: GPL-2+ + +Files: git/perl/Git.pm +Copyright: © 2006, by Petr Baudis +License: GPL-2+ + +Files: git/perl/private-Error.pm +Copyright: © 1997-8, Graham Barr +License: GPL-1+ or Artistic-1 + This program is free software; you can redistribute it and/or modify + it under the terms of either: + . + a) the GNU General Public License as published by the Free Software + Foundation; either version 1, or (at your option) any later + version, or + . + b) the "Artistic License" which comes with Perl. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL' and + the Artistic Licence in '/usr/share/common-licenses/Artistic'. + +Files: git/kwset.c git/kwset.h +Copyright: © 1989, 1998, 2000, 2005, Free Software Foundation, Inc. +License: GPL-2+ + +Files: git/khash.h +Copyright: © 2008, 2009, 2011 by Attractive Chaos +License: Expat + +Files: git/trace.c +Copyright: © 2000-2002, Michael R. Elkins + © 2002-2004, Oswald Buddenhagen + © 2004, Theodore Y. Ts'o + © 2006, Mike McCormack + © 2006, Christian Couder +License: GPL-2+ + +Files: git/sh-i18n--envsubst.c +Copyright: © 2010, Ævar Arnfjörð Bjarmason + © 1998-2007, Free Software Foundation, Inc. +License: GPL-2+ + +Files: git/t/test-lib.sh +Copyright: © 2005, Junio C Hamano +License: GPL-2+ + +Files: git/compat/inet_ntop.c git/compat/inet_pton.c +Copyright: © 1996-2001, Internet Software Consortium. +License: ISC + +Files: git/compat/poll/poll.c git/compat/poll/poll.h +Copyright: © 2001-2003, 2006-2011, Free Software Foundation, Inc. +Name: Emulation for poll(2) from gnulib. +License: GPL-2+ + +Files: git/compat/vcbuild/include/sys/utime.h +Copyright: ? +License: mingw-runtime + +Files: git/compat/nedmalloc/* +Copyright: © 2005-2006 Niall Douglas +License: Boost + +Files: git/compat/nedmalloc/malloc.c.h +Copyright: © 2006, KJK::Hyperion +License: dlmalloc + +Files: git/compat/regex/* +Copyright: © 1985, 1989-93, 1995-2010, Free Software Foundation, Inc. +Name: Extended regular expression matching and search library +License: LGPL-2.1+ + +Files: git/compat/obstack.c git/compat/obstack.h +Copyright: © 1988-1994, 1996-2005, 2009, Free Software Foundation, Inc. +Name: Object stack macros. +License: LGPL-2.1+ + +Files: git/contrib/persistent-https/* +Copyright: © 2012, Google Inc. +License: Apache-2.0 + +Files: git/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c +Copyright: © 2011, John Szakmeister + © 2012, Philipp A. Hartmann +License: GPL-2+ + +Files: git/contrib/hg-to-git/hg-to-git.py +Copyright: © 2007, Stelian Pop +Name: hg-to-git.py - A Mercurial to GIT converter +License: GPL-2+ + +Files: git/contrib/mw-to-git/git-*.perl git/contrib/mw-to-git/t/t* +Copyright: © 2011 + Jérémie Nikaes + Arnaud Lacurie + Claire Fousse + David Amouyal + Matthieu Moy + © 2012 + Charles Roussel + Simon Cathebras + Julien Khayat + Guillaume Sasdy + Simon Perrat + © 2013 + Benoit Person + Celestin Matte +License: GPL-2+ + +License: GPL-2 + You can redistribute this software and/or modify it under the terms of + the GNU General Public License as published by the Free Software + Foundation; version 2 dated June, 1991. + . + 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. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: GPL-2+ + 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, 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. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + . + This library 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 + Library General Public License for more details. + . + On Debian systems, the complete text of the GNU Library General Public License + can be found in the /usr/share/common-licenses/LGPL-2 file. + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in /usr/share/common-licenses/LGPL-2.1. + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the full text of the Apache License version 2 can + be found in /usr/share/common-licenses/Apache-2.0. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice(s), this list of conditions and the following disclaimer + unmodified other than the allowable addition of one or more + copyright notices. + 2. Redistributions in binary form must reproduce the above copyright + notice(s), this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + +License: Expat + : + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License: EDL-1.0 + Redistribution and use in source and binary forms, with or + without modification, are permitted provided that the following + conditions are met: + . + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + - Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + . + - Neither the name of the Eclipse Foundation, Inc. nor the + names of its contributors may be used to endorse or promote + products derived from this software without specific prior + written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: mingw-runtime + This file has no copyright assigned and is placed in the Public Domain. + This file is a part of the mingw-runtime package. + . + The mingw-runtime package and its code is distributed in the hope that it + will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR + IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to + warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + You are free to use this package and its code without limitation. + +License: Boost + It is licensed under the Boost Software License which basically means + you can do anything you like with it. This does not apply to the malloc.c.h + file which remains copyright to others. + . + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: dlmalloc + This is a version (aka dlmalloc) of malloc/free/realloc written by + Doug Lea and released to the public domain, as explained at + http://creativecommons.org/licenses/publicdomain. Send questions, + comments, complaints, performance data, etc to dl@cs.oswego.edu + . + Incorporates code from intrin_x86.h, which bears the following notice: + . + Compatibility header for GCC -- GCC equivalents of intrinsic + Microsoft Visual C++ functions. Originally developed for the ReactOS + () and TinyKrnl () + projects. + . + Copyright (c) 2006 KJK::Hyperion + . + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/debian/patches/Use-debian-binary-name-rst2html b/debian/patches/Use-debian-binary-name-rst2html new file mode 100644 index 0000000..90165e3 --- /dev/null +++ b/debian/patches/Use-debian-binary-name-rst2html @@ -0,0 +1,17 @@ +From: =?UTF-8?q?Stefan=20B=C3=BChler?= +Date: Wed, 29 May 2013 14:34:15 +0200 +Subject: Use debian binary name rst2html + +--- + filters/html-converters/rst2html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/filters/html-converters/rst2html b/filters/html-converters/rst2html +index c51f5be..a1ba574 100755 +--- a/filters/html-converters/rst2html ++++ b/filters/html-converters/rst2html +@@ -1,2 +1,2 @@ + #!/bin/bash +-exec rst2html.py --template <(echo -e "%(stylesheet)s\n%(body_pre_docinfo)s\n%(docinfo)s\n%(body)s") ++exec rst2html --template <(echo -e "%(stylesheet)s\n%(body_pre_docinfo)s\n%(docinfo)s\n%(body)s") + diff --git a/debian/patches/add-highlighting-rules-to-cgit.css b/debian/patches/add-highlighting-rules-to-cgit.css new file mode 100644 index 0000000..087e035 --- /dev/null +++ b/debian/patches/add-highlighting-rules-to-cgit.css @@ -0,0 +1,31 @@ +From: =?UTF-8?q?Stefan=20B=C3=BChler?= +Date: Wed, 29 May 2013 11:23:53 +0200 +Subject: add highlighting rules to cgit.css + +--- + cgit.css | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +--- a/cgit.css ++++ b/cgit.css +@@ -809,3 +809,20 @@ + div#cgit table.ssdiff td.space div { + min-height: 3em; + } ++ ++/* Style definition file generated by highlight 3.9, http://www.andre-simon.de/ */ ++/* Highlighting theme: Kwrite Editor */ ++/* adapted for cgit */ ++div#cgit table.blob .num { color:#b07e00; } ++div#cgit table.blob .esc { color:#ff00ff; } ++div#cgit table.blob .str { color:#bf0303; } ++div#cgit table.blob .pps { color:#818100; } ++div#cgit table.blob .slc { color:#838183; font-style:italic; } ++div#cgit table.blob .com { color:#838183; font-style:italic; } ++div#cgit table.blob .ppc { color:#008200; } ++div#cgit table.blob .opt { color:#000000; } ++div#cgit table.blob .lin { color:#555555; } ++div#cgit table.blob .kwa { color:#000000; font-weight:bold; } ++div#cgit table.blob .kwb { color:#0057ae; } ++div#cgit table.blob .kwc { color:#000000; font-weight:bold; } ++div#cgit table.blob .kwd { color:#010181; } diff --git a/debian/patches/assume-highlight-version-3-in-filter-script b/debian/patches/assume-highlight-version-3-in-filter-script new file mode 100644 index 0000000..4f0e4b1 --- /dev/null +++ b/debian/patches/assume-highlight-version-3-in-filter-script @@ -0,0 +1,20 @@ +From: =?UTF-8?q?Stefan=20B=C3=BChler?= +Date: Fri, 10 May 2013 09:53:00 +0200 +Subject: assume highlight version 3 in filter script + +--- + filters/syntax-highlighting.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/filters/syntax-highlighting.sh ++++ b/filters/syntax-highlighting.sh +@@ -115,7 +115,7 @@ + # found (for example) on EPEL 6. + # + # This is for version 2 +-exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null ++#exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null + + # This is for version 3 +-#exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null ++exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null diff --git a/debian/patches/debianize_makefile b/debian/patches/debianize_makefile new file mode 100644 index 0000000..26b8a6c --- /dev/null +++ b/debian/patches/debianize_makefile @@ -0,0 +1,18 @@ +Index: upstream/Makefile +=================================================================== +--- upstream.orig/Makefile ++++ upstream/Makefile +@@ -2,11 +2,11 @@ all:: + + CGIT_VERSION = v0.12 + CGIT_SCRIPT_NAME = cgit.cgi +-CGIT_SCRIPT_PATH = /var/www/htdocs/cgit ++CGIT_SCRIPT_PATH = /usr/share/cgit + CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) + CGIT_CONFIG = /etc/cgitrc + CACHE_ROOT = /var/cache/cgit +-prefix = /usr/local ++prefix = /usr + libdir = $(prefix)/lib + filterdir = $(libdir)/cgit/filters + docdir = $(prefix)/share/doc/cgit diff --git a/debian/patches/hardening b/debian/patches/hardening new file mode 100644 index 0000000..da26ced --- /dev/null +++ b/debian/patches/hardening @@ -0,0 +1,13 @@ +Description: Add hardening + Add hardening to cgit. +Author: Alexander Wirt + +--- /dev/null ++++ cgit-0.10.2.git2.0.1/cgit.conf +@@ -0,0 +1,6 @@ ++CC =gcc ++CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS) ++CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) ++CGIT_CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) ++LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS) ++ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f7a2e72 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,9 @@ +# The patch files of the -p1 format included in the debian/patches directory +# are applied to the upstream source in the order listed below. +# This is manually managed by users with dquilt (quilt(1) wrapper) etc. +# Also this may be updated by dpkg-source(1) when making a package. +debianize_makefile +hardening +assume-highlight-version-3-in-filter-script +add-highlighting-rules-to-cgit.css +Use-debian-binary-name-rst2html diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a40954e --- /dev/null +++ b/debian/rules @@ -0,0 +1,53 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#DH_VERBOSE = 1 + +# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +CC =gcc +CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) +CGIT_CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) +LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS) + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +b := $(shell pwd)/debian/cgit/ + +# main packaging script based on dh7 syntax +%: + dh $@ --with apache2 + +override_dh_auto_clean: + dh_auto_clean + make cleanall + -rm tests/test-results/*.counts + -rm -rf .depend + -rm cgitrc.5 + +override_dh_auto_build: + dh_auto_build + a2x -f manpage cgitrc.5.txt + +override_dh_auto_install: + dh_auto_install + mv $b/usr/share/cgit/cgit.cgi $b/usr/lib/cgit + +override_dh_auto_test: + chmod +x tests/*.sh + dh_auto_test + +override_dh_fixperms: + dh_fixperms + chown www-data:www-data $b/var/cache/cgit diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..c3d9f24 --- /dev/null +++ b/debian/source/format @@ -0,0 +1,2 @@ +3.0 (quilt) + diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..63265ba --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +cgit source: python-depends-but-no-python-helper cgit +cgit source: missing-build-dependency-for-dh-addon apache2 => apache2-dev diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..0b80211 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,3 @@ +#### Uncomment to active options. See dpkg-source(1) +#abort-on-upstream-changes +#unapply-patches -- cgit v1.1