aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/Use-debian-binary-name-rst2html17
-rw-r--r--debian/patches/add-highlighting-rules-to-cgit.css31
-rw-r--r--debian/patches/assume-highlight-version-3-in-filter-script20
-rw-r--r--debian/patches/debianize_makefile18
-rw-r--r--debian/patches/hardening13
-rw-r--r--debian/patches/series9
6 files changed, 108 insertions, 0 deletions
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?= <stbuehler@web.de>
+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?= <stbuehler@web.de>
+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?= <stbuehler@web.de>
+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 <formorer@debian.org>
+
+--- /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