diff options
| -rw-r--r-- | development/cgit/cgit.SlackBuild | 7 | ||||
| -rw-r--r-- | development/cgit/cgit.info | 6 | ||||
| -rw-r--r-- | development/cgit/patches/0001-record.repo.snapshot-prefix.in.the.per-repo.config.patch | 27 |
3 files changed, 5 insertions, 35 deletions
diff --git a/development/cgit/cgit.SlackBuild b/development/cgit/cgit.SlackBuild index f3e5b77e20..0e8f7f5725 100644 --- a/development/cgit/cgit.SlackBuild +++ b/development/cgit/cgit.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cgit -VERSION=${VERSION:-1.2} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,7 +55,7 @@ else LIBDIRSUFFIX="" fi -CGIT_VERSION=${CGIT_VERSION:-v1.2} +CGIT_VERSION=${CGIT_VERSION:-v$VERSION} GIT_VERSION=${GIT_VERSION:-2.18.0} DOCS="cgitrc.5.txt COPYING README $CWD/config/cgitrc.sample \ @@ -78,9 +78,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# apply patches from upstream -patch -p1 < $CWD/patches/0001-record.repo.snapshot-prefix.in.the.per-repo.config.patch - # prepare sources sed -i Makefile \ -e "s|-g -Wall -Igit|-Wall ${SLKCFLAGS} -Igit|" \ diff --git a/development/cgit/cgit.info b/development/cgit/cgit.info index e76f5e0cc1..98564a09a3 100644 --- a/development/cgit/cgit.info +++ b/development/cgit/cgit.info @@ -1,9 +1,9 @@ PRGNAM="cgit" -VERSION="1.2" +VERSION="1.2.1" HOMEPAGE="https://git.zx2c4.com/cgit/about/" -DOWNLOAD="https://git.zx2c4.com/cgit/snapshot/cgit-1.2.tar.xz \ +DOWNLOAD="https://git.zx2c4.com/cgit/snapshot/cgit-1.2.1.tar.xz \ https://www.kernel.org/pub/software/scm/git/git-2.18.0.tar.xz" -MD5SUM="fa13e0e093b9e7e769bc98842e9e4a42 \ +MD5SUM="8580586d320e4a4d71e1e07d4bf4a6fe \ 7a668403aa7807d0db37e8573299d471" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/development/cgit/patches/0001-record.repo.snapshot-prefix.in.the.per-repo.config.patch b/development/cgit/patches/0001-record.repo.snapshot-prefix.in.the.per-repo.config.patch deleted file mode 100644 index 780684712f..0000000000 --- a/development/cgit/patches/0001-record.repo.snapshot-prefix.in.the.per-repo.config.patch +++ /dev/null @@ -1,27 +0,0 @@ -Konstantin Ryabitsev konstantin at linuxfoundation.org -Tue Jul 17 18:38:22 CEST 2018 - -Even if we find snapshot-prefix in the repo configuration, we are not -writing it out into the rc- file, so setting the value does not have any -effect. - -Signed-off-by: Konstantin Ryabitsev <konstantin at linuxfoundation.org> ---- - cgit.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cgit.c b/cgit.c -index e2d7891..a39d83a 100644 ---- a/cgit.c -+++ b/cgit.c -@@ -830,6 +830,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo) - fprintf(f, "repo.snapshots=%s\n", tmp ? tmp : ""); - free(tmp); - } -+ if (repo->snapshot_prefix) -+ fprintf(f, "repo.snapshot-prefix=%s\n", repo->snapshot_prefix); - if (repo->max_stats != ctx.cfg.max_stats) - fprintf(f, "repo.max-stats=%s\n", - cgit_find_stats_periodname(repo->max_stats)); --- -2.17.1 |