summaryrefslogtreecommitdiffstatshomepage
path: root/Makefile (unfollow)
Commit message (Collapse)AuthorLines
2013-05-31Add faviconChristian Hesse-0/+2
This adds a favicon to cgit. It is not enabled by default, though. The file contains two icons, 16x16 and 32x32 pixels, optimized for size.
2013-05-27CGIT-0.9.2Jason A. Donenfeld-2/+2
Features: - update to git v1.8.3. - expanded set of default filters to include markdown, restructuredtext, and man pages. - better sample configuration file in man page. - "readme" may now be specified multiple times, and cgit will choose the first one it finds. - "readme" no longer needs a branch name. If prefixed with simply ":" it will use the default branch. - "branch-sort" allowing branches to be sorted either by "age" or "name", for kernel.org. - "enable-index-owner" allowing the owner column to be disabled in the index page. - print submodule revision next to submodule link. - integrate more closely with git apis, such as strbuf. - rely on git test harness and git makefiles. - more robust test suite. - more rebust makefile dependency accounting. - pager navigation is now unordered list. - span tag wraps commit directions. Behavior changes: - HOME is no longer passed as an environment variable to any filter api scripts. - "about-filter" now receives the filename being filtered as argv[1]. This may disrupt existing scripts, so adjust accordingly. - gitconfig and gitattributes are no longer loaded from any system directories or home directories. Security: - CVE-2013-2117: disallow directory traversal when readme is set to filesystem path. Bug fixes: - ssdiff now correctly manages tab expansion. - support unannotated tags in http git clone. - lots of cleanups of global variables and memory leaks. - do not rely on gettext/libintl. - better C standard compliance. - make several functions and variables static. - improved constification. - remove unused functions. - fix colspan values to correct width. - fix out-of-bounds memory accesses with virtual_root="". - cache repo config more precisely. - die when write fails. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2013-05-27filters: import more modern scriptsJason A. Donenfeld-1/+2
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2013-05-25git: update to 1.8.3John Keeping-1/+1
No changes required, just bump the submodule and Makefile versions. Signed-off-by: John Keeping <john@keeping.me.uk>
2013-05-22Makefile: fix parallel "make test"John Keeping-5/+3
When building the "test" target we depend on both cgit and building the Git tools. By doing this with two targets we end up running make in the git/ directory twice, concurrently if using parallel make, which causes us to build more than we need and potentially builds incorrectly if multi-step build-then-move operations overlap. Fix this by instead calling back into the makefile so that we alter the "cgit" target to also build the Git tools. Signed-off-by: John Keeping <john@keeping.me.uk>
2013-04-27git: update to 1.8.2.2John Keeping-1/+1
No changes required, just bump the submodule and Makefile version. Signed-off-by: John Keeping <john@keeping.me.uk>
2013-04-08tests: use Git's test frameworkJohn Keeping-2/+5
This allows tests to run in parallel as well as letting us use "prove" or another TAP harness to run the tests. Git's test framework requires Git to be fully built before letting any tests run, so add a new target to the top-level Makefile which builds all of Git instead of just libgit.a and make the "test" target depend on that. Signed-off-by: John Keeping <john@keeping.me.uk>
2013-04-08Update git to v1.8.2.1John Keeping-1/+1
This requires a small change to how we handle notes, but otherwise just works. Note that we can't use anything from v1.8.0 until v1.8.2.1 because some of the symbols that we need for graph drawing were made private in v1.8.0 and this was not reverted until v1.8.2.1. Signed-off-by: John Keeping <john@keeping.me.uk>
2013-03-20Makefile: remove CGIT-CFLAGS files in clean stageJason A. Donenfeld-1/+1
2013-03-20Makefile: re-use Git's Makefile where possibleJohn Keeping-119/+5
Git does quite a lot of platform-specific detection in its Makefile, which can result in it defining preprocessor variables that are used in its header files. If CGit does not define the same variables it can result in different sizes of some structures in different places in the same application. For example, on Solaris Git uses it's "compat" regex library which has a different sized regex_t structure than that available in the platform regex.h. This has a knock-on effect on the size of "struct rev_info" and leads to hard to diagnose runtime issues. In order to avoid all of this, introduce a "cgit.mk" file that includes Git's Makefile and make all of the existing logic apply to CGit's objects as well. This is slightly complicated because Git's Makefile must run in Git's directory, so all references to CGit files need to be prefixed with "../". In addition, OBJECTS is a simply expanded variable in Git's Makefile so we cannot just add our objects to it. Instead we must copy the two applicable rules into "cgit.mk". This has the advantage that we can split CGit-specific CFLAGS from Git's CFLAGS and hence avoid rebuilding all of Git whenever a CGit-specific value changes. Signed-off-by: John Keeping <john@keeping.me.uk> Acked-by: Jamie Couture <jamie.couture@gmail.com>
2013-03-04Makefile: Disable gettext in the Git submoduleLukas Fleischer-1/+1
Newer libgit versions depend on the libintl library. However, we currently do not link against libintl which breaks compilation under OpenBSD: git/libgit.a(commit.o)(.text+0x1d1b): In function `lookup_commit_or_die': git/gettext.h:47: undefined reference to `libintl_gettext' [...] Since we do not support i18n in cgit, just disable gettext in the Git submodule to fix this. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2013-03-04Makefile: improve dependency generationJamie Couture-70/+82
Makefile target generation would always be included for any makefile target that was not clean. Only care to include the '.deps' directory when building cgit, rather than generating and including dependencies when calling other makefile targets. Heavily borrowed from git's Makefile, but without definitions to test for the compiler's header dependency feature. Previous Makefile implementation never checked for this compiler feature anyway. - Removed makecmdgoal 'clean' check - Grouped like .PHONY target definitions - Place build dependency targets under .SUFFIXES - Re-arranged location of library inclusion definitions - Use google code mirror instead of github Signed-off-by: Jamie Couture <jamie.couture@gmail.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2012-11-15CGIT-0.9.1Jason A. Donenfeld-1/+1
Enhancements: - path-selected submodule links - intelligent default branch guessing - /etc/mime.types lookup - gitweb.* and cgit.* git-config support - case insensitive sorting and age sorting - commit, repository, and section sorting - bold currently viewed page in pagination - support BSDs in makefile Security: - CVE-2012-4465: heap-buffer overflow in parsing.c - CVE-2012-4548: syntax highlighting command injection Bug Fixes: - transition maintainer to Jason Donenfeld (zx2c4) - download git snapshot from github instead of Lars' old server - css fixes - stablization of tests - more compatible default highlight script - suppress gzip timestamp so that tarballs only use tar timestamps - treat ctags as target in makefile - do not let global variables override certain local repo settings - print ampersand as proper html entity - use placeholder for empty commit subject - format diff view for addition and removal of files - point links at correct blob from ssdiff Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2012-11-04Makefile: get snapshots from githubFerry Huberts-2/+2
Github will have more bandwidth than Lars' server.
2012-10-31Makefile: remove tags fileJamie Couture-1/+1
Remove tags file from working directory. Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
2012-10-17Makefile: Support OpenBSD just like FreeBSDJason A. Donenfeld-2/+2
2012-10-17Makefile: support FreeBSD libiconv pathsJason A. Donenfeld-0/+7
According to Dan Rue <drue@therub.org>, FreeBSD requires the lib paths to get libiconv from /usr/local.
2012-10-08Makefile: add tag target to generate ctagsJamie Couture-1/+5
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
2012-03-18CGIT-0.9.0.3Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2012-01-03Makefile: fetch git tarballs from http://hjemli.net/git/git/Lars Hjemli-1/+1
The git tarballs are currently not available from kernel.org, so for now the makefile will download autogenerated tarballs from cgit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-07-21CGIT 0.9.0.2Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-07-19Makefile: fix oversight of not using $(DESTDIR) in uninstallFerry Huberts-3/+3
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-06-13CGIT 0.9.0.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-03-05CGIT 0.9Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-03-05CGIT 0.8.3.5Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-02-19Makefile: Make `make get-git` work under OpenBSD.Lukas Fleischer-1/+1
OpenBSD tar(1) defaults to read from "/dev/rst0" when not specifying an filename and thus fails to extract the Git sourcecode when not passing stdin as input file descriptor explicitly. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2011-02-19Use GIT-1.7.4Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-11-10Add vector utility functionsLars Hjemli-0/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-11-10Makefile: avoid spurious rebuilds of git sources due to `sudo make`Lars Hjemli-0/+2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-11-07Makefile: add -MP optionLars Hjemli-1/+1
Work around errors `make` gives when header files are removed without the Makefile being updated. Signed-off-by: Lynn Lin <Lynn.Lin@emc.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-27CGIT 0.8.3.4Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-27Use GIT-1.7.3Lars Hjemli-2/+2
This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542. Noticed-by: Silvio Cesare <silvio.cesare@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19Install filter scriptsTodd Zullinger-0/+4
The syntax-highlighting.sh script is quite useful without any changes. Installing it by default makes it easier to use and package. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19Add Makefile targets to install/uninstall docsTodd Zullinger-1/+38
Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19Generalize doc generationTodd Zullinger-7/+16
This borrows from the git Documentation/Makefile. The goal is to make it easier to add new man pages and other documentation as well as to prevent make from re-generating the documentation needlessly. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-19Use GIT-1.7.3Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-09-04fix errors in printf-style format stringsMark Lodato-0/+8
There were many places where the arguments to a printf-like function did not match the format string. Mostly, these were a missing 'l' flag, but there were three exceptions: - In ui-stats.c, a size_t argument must be printed. C99 has the "%zu" flag for this purpose, but not all compilers support this. Therefore, we mimic what git does - use a NO_C99_FORMAT Makefile variable. - In ui-stats.c, cgit_print_error() was called with a pointer instead of a character. - In ui-log.c, the "columns" argument was never used. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-08-22Use GIT-1.7.2.2Lars Hjemli-2/+2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-08-03CGIT 0.8.3.3Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-07-22Makefile: do not include dependency-file on `make clean`Lynn Lin-1/+3
When envoking clean target, make should not perform the dependency file generation triggered by include.
2010-06-19CGIT 0.8.3.2Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2010-02-27Use GIT-1.7.0Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-12-12CGIT 0.8.3.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-11-07Add NO_OPENSSL optionMikhail Gusarov-3/+12
Linking with OpenSSL is not always desirable. Add NO_OPENSSL option to use SHA-1 code bundled with Git. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2009-09-16First version of side-by-side diff.Ragnar Ouchterlony-0/+1
This constitutes the first prototype of a side-by-side diff. It is not possible to switch between unidiff and side-by-side diff at all at this stage. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-09-13CGIT 0.8.3Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-09-13CGIT 0.8.2.2Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-09-13Use GIT-1.6.4.3Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <larsh@slackbox.hjemli.net>
2009-08-16Use GIT-1.6.3.4Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-03-15CGIT 0.8.2.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>