Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Ertuğrul Erata
2015-07-16 01:58:49 +03:00
19 changed files with 34272 additions and 32051 deletions
+1 -1
View File
@@ -19,7 +19,7 @@
<Name>libqmi</Name>
<RuntimeDependencies>
<Dependency>glib2</Dependency>
</RuntimeDependencies
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
+33686 -32048
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
097b19434ceb0666ca5468f50fc08a82e03580b9
bf10bd7d2dde02fa7f4658e8d450f83693844f84
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
dd30825df17e2a7dd6ac652f5709c3a2e19b3ad8
a1f6f71ce02bee394f4b83f465df5860dc7100f6
+67
View File
@@ -0,0 +1,67 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import shelltools
from pisi.actionsapi import perlmodules
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
config = """
V = 1
CFLAGS = %s
LDFLAGS = %s
INSTALLDIRS = vendor
DESTDIR = %s
prefix = /usr
htmldir = /usr/share/doc/git
sysconfdir = /etc
ETC_GITCONFIG = /etc/gitconfig
GITWEB_CSS = gitweb/gitweb.css
GITWEB_LOGO = gitweb/git-logo.png
GITWEB_FAVICON = gitweb/git-favicon.png
GITWEB_JS = gitweb/gitweb.js
PYTHON_PATH = /usr/bin/python3
PERL_MM_OPT =""
GIT_TEST_OPTS ='--no-color'
gitwebdir = /var/www/localhost/cgi-bin
ASCIIDOC8 = 1
ASCIIDOC_NO_ROFF = 1
BLK_SHA1 = 1
NEEDS_CRYPTO_WITH_SSL = 1
USE_LIBPCRE = 1
NO_CROSS_DIRECTORY_HARDLINKS = 1
MAN_BOLD_LITERAL = 1
V = 1
""" % (get.CFLAGS(), get.LDFLAGS(), get.installDIR())
def setup():
shelltools.echo("config.mak", config)
def build():
pisitools.dosed("Makefile", "^CC = .*$", "CC = %s" % get.CC())
autotools.make("all doc gitweb/gitweb.cgi")
def install():
autotools.rawInstall("install-doc")
# Install bash completion
pisitools.insinto("/etc/bash_completion.d", "contrib/completion/git-completion.bash", "git")
shelltools.chmod("%s/etc/bash_completion.d/git" % get.installDIR(), 0644)
# for git-daemon
pisitools.dodir("/pub/scm")
# emacs support
#autotools.install("-C contrib/emacs")
#pisitools.insinto("/usr/share/doc/emacs-git", "contrib/emacs/README")
# Some docs
pisitools.dodoc("README", "COPYING", "Documentation/SubmittingPatches")
# remove .pod and .packlist files
perlmodules.removePodfiles()
perlmodules.removePacklist()
+29
View File
@@ -0,0 +1,29 @@
from comar.service import *
serviceType = "server"
serviceDesc = _({"en": "GIT Server",
"tr": "GIT Sunucusu"})
serviceDefault = "off"
serviceConf = "git-daemon"
@synchronized
def start():
startService(command="/usr/bin/git",
args="daemon \
--base-path=/pub/scm \
--pid-file=/run/git-daemon.pid \
--user-path=public_git \
--detach \
--export-all \
--syslog \
--verbose %s" % config.get("GITDAEMON_OPTS"),
pidfile="/run/git-daemon.pid",
donotify=True)
@synchronized
def stop():
stopService(pidfile="/run/git-daemon.pid",
donotify=True)
def status():
return isServiceRunning("/run/git-daemon.pid")
+1
View File
@@ -0,0 +1 @@
(add-to-list 'vc-handled-backends 'GIT)
@@ -0,0 +1,5 @@
# Include the current git branch in the prompt
if type __git_ps1 >/dev/null 2>/dev/null; then
export PS1="$(echo -n "$PS1" | sed "s|\\\W\]|\\\W\$(__git_ps1 \" (%s)\")\]|")"
fi
@@ -0,0 +1,13 @@
Index: git-1.7.6.4/gitweb/Makefile
===================================================================
--- git-1.7.6.4.orig/gitweb/Makefile
+++ git-1.7.6.4/gitweb/Makefile
@@ -56,7 +56,7 @@ PERL_PATH ?= /usr/bin/perl
# Shell quote;
bindir_SQ = $(subst ','\'',$(bindir))#'
gitwebdir_SQ = $(subst ','\'',$(gitwebdir))#'
-gitwebstaticdir_SQ = $(subst ','\'',$(gitwebdir)/static)#'
+gitwebstaticdir_SQ = $(subst ','\'',$(gitwebdir)/gitweb)#'
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))#'
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))#'
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))#'
@@ -0,0 +1,11 @@
--- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100
+++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100
@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT
our $home_link = $my_uri || "/";
# string of the home link on top of all pages
-our $home_link_str = "++GITWEB_HOME_LINK_STR++";
+our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects";
# name of your site or organization to appear in page titles
# replace this with something more descriptive for clearer bookmarks
@@ -0,0 +1,26 @@
From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Mon, 23 Mar 2009 00:03:36 -0400
Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output
Signed-off-by: Todd Zullinger <tmz@pobox.com>
---
git-cvsimport.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index e439202..d020f1a 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -952,7 +952,7 @@ while (<CVS>) {
} elsif (/^-+$/) { # end of unknown-line processing
$state = 1;
} elsif ($state != 11) { # ignore stuff when skipping
- print STDERR "* UNKNOWN LINE * $_\n";
+ print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /;
}
}
commit() if $branch and $state != 11;
--
1.6.2.2
@@ -0,0 +1,8 @@
# Meaningful options are:
# --syslog --- Enables syslog logging
# --verbose --- Enables verbose logging
# --export-all --- Exports all repositories even if they don't contain git-daemon-export-ok file
# --port=XXXX --- Starts in port XXXX instead of 9418
# --base-path=/path --- Remap all the path requests as relative to the given path
#
GITDAEMON_OPTS=""
+8
View File
@@ -0,0 +1,8 @@
Alias /git /var/www/localhost/cgi-bin
<Directory /var/www/localhost/cgi-bin>
Options +ExecCGI
AddHandler cgi-script .cgi
DirectoryIndex gitweb.cgi
</Directory>
@@ -0,0 +1,17 @@
Index: git-1.6.3/gitk-git/gitk
===================================================================
--- git-1.6.3.orig/gitk-git/gitk
+++ git-1.6.3/gitk-git/gitk
@@ -10931,9 +10931,9 @@ if {[tk windowingsystem] eq "aqua"} {
set textfont {Monaco 9}
set uifont {{Lucida Grande} 9 bold}
} else {
- set mainfont {Helvetica 9}
- set textfont {Courier 9}
- set uifont {Helvetica 9 bold}
+ set mainfont {{DejaVu Sans} 9}
+ set textfont {{DejaVu Sans Mono} 9}
+ set uifont {{DejaVu Sans} 9 bold}
}
set tabstop 8
set findmergefiles 0
+3
View File
@@ -0,0 +1,3 @@
# Write project root here
PROJECT_ROOT="/usr/local/scm"
@@ -0,0 +1,19 @@
--- gitweb/gitweb.perl 2007-04-04 11:40:33.000000000 +0300
+++ gitweb/gitweb.perl 2007-04-08 21:30:31.000000000 +0300
@@ -32,8 +32,14 @@
our $GIT = "++GIT_BINDIR++/git";
# absolute fs-path which will be prepended to the project path
-#our $projectroot = "/pub/scm";
-our $projectroot = "++GITWEB_PROJECTROOT++";
+our $projectroot = "/usr/local/scm";
+open(CONF, '/etc/conf.d/gitweb');
+
+while (<CONF>) {
+ do { $projectroot = $1; last } if /^PROJECT_ROOT="([^"]+)"/;
+}
+
+close(CONF);
# target of the home link on top of all pages
our $home_link = $my_uri || "/";
+321
View File
@@ -0,0 +1,321 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>git</Name>
<Homepage>http://git-scm.com/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Summary>Fast Version Control System</Summary>
<Description>Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.</Description>
<Archive sha1sum="d0fc3d9fb551ce9c45c94df3bb88f13ca7905869" type="tarxz">https://www.kernel.org/pub/software/scm/git/git-2.4.4.tar.xz</Archive>
<BuildDependencies>
<Dependency>tcltk-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>xmlto</Dependency>
<Dependency>asciidoc</Dependency>
<Dependency>perl-Error</Dependency>
<Dependency>perl</Dependency>
<!--Needed for emacs-Git package
<Dependency>emacs</Dependency>-->
</BuildDependencies>
<Patches>
<Patch>project-root.patch</Patch>
<Patch level="1">gitk-fonts.patch</Patch>
<Patch level="1">git-1.5-gitweb-home-link.patch</Patch>
<Patch level="1">git-cvsps-ignore.patch</Patch>
<Patch level="1">fix-gitwebdir.patch</Patch>
</Patches>
</Source>
<Package>
<Name>git</Name>
<IsA>app:console</IsA>
<RuntimeDependencies>
<Dependency>perl-String-ShellQuote</Dependency>
<Dependency>perl-Net-SMTP-SSL</Dependency>
<Dependency>perl-Authen-SASL</Dependency>
<Dependency>perl-libwww</Dependency>
<Dependency>libpcre</Dependency>
<Dependency version="current">perl-Git</Dependency>
<Dependency>openssh</Dependency>
<Dependency>openssl</Dependency>
<Dependency>rsync</Dependency>
<Dependency>expat</Dependency>
<Dependency>zlib</Dependency>
<Dependency>curl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/libexec/git-core</Path>
<Path fileType="data">/etc/bash_completion.d</Path>
<Path fileType="data">/usr/share/git-core</Path>
<Path fileType="locale">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>git-daemon</Name>
<IsA>service</IsA>
<Summary>GIT protocol daemon</Summary>
<RuntimeDependencies>
<Dependency version="current">git</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/conf.d/git-daemon</Path>
<Path fileType="executable">/usr/libexec/git-core/git-daemon</Path>
<Path fileType="man">/usr/share/man/man1/*daemon*.1*</Path>
<Path fileType="data">/pub/scm</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/conf.d/git-daemon">git-daemon.confd</AdditionalFile>
</AdditionalFiles>
<Provides>
<COMAR script="service.py">System.Service</COMAR>
</Provides>
</Package>
<Package>
<Name>perl-Git</Name>
<IsA>library</IsA>
<PartOf>programming.language.perl</PartOf>
<Summary>Perl interface to GIT</Summary>
<RuntimeDependencies>
<Dependency>perl-Error</Dependency>
<Dependency>perl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/perl5</Path>
<Path fileType="man">/usr/share/man/man3/Git.3pm</Path>
</Files>
</Package>
<!-- <Package>
<Name>emacs-Git</Name>
<IsA>data</IsA>
<PartOf>editor.emacs</PartOf>
<Summary>Git support for emacs</Summary>
<RuntimeDependencies>
<Dependency>emacs</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/emacs/site-lisp/git*</Path>
<Path fileType="doc">/usr/share/doc/emacs-git</Path>
</Files>
</Package> -->
<Package>
<Name>git-svn</Name>
<IsA>app:console</IsA>
<Summary>Git tools for importing Subversion repositories</Summary>
<RuntimeDependencies>
<Dependency version="current">git</Dependency>
<Dependency>subversion</Dependency>
<Dependency>perl-Term-ReadKey</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/libexec/git-core/*svn*</Path>
<Path fileType="man">/usr/share/man/man1/*svn*.1*</Path>
</Files>
</Package>
<Package>
<Name>git-cvs</Name>
<IsA>app:console</IsA>
<Summary>Git tools for importing CVS repositories</Summary>
<RuntimeDependencies>
<Dependency version="current">git</Dependency>
<Dependency>cvs</Dependency>
<Dependency>cvsps</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/libexec/git-core/*cvs*</Path>
<Path fileType="executable">/usr/bin/git-cvsserver</Path>
<Path fileType="man">/usr/share/man/man1/*cvs*.1*</Path>
<Path fileType="man">/usr/share/man/man7/*cvs*.7*</Path>
</Files>
</Package>
<Package>
<Name>gitk</Name>
<IsA>app:gui</IsA>
<Summary>Git revision tree visualiser</Summary>
<RuntimeDependencies>
<Dependency version="current">git</Dependency>
<Dependency>tcltk</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/gitk</Path>
<Path fileType="localedata">/usr/share/gitk</Path>
<Path fileType="man">/usr/share/man/man1/*gitk*.1*</Path>
</Files>
</Package>
<Package>
<Name>git-gui</Name>
<IsA>app:gui</IsA>
<Summary>Git GUI tool</Summary>
<RuntimeDependencies>
<Dependency version="current">git</Dependency>
<Dependency version="current">gitk</Dependency>
<Dependency>tcltk</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/libexec/git-core/git-gui*</Path>
<Path fileType="executable">/usr/libexec/git-core/git-citool</Path>
<Path fileType="data">/usr/share/git-gui</Path>
<Path fileType="man">/usr/share/man/man1/git-gui.1*</Path>
<Path fileType="man">/usr/share/man/man1/git-citool.1*</Path>
</Files>
</Package>
<Package>
<Name>gitweb</Name>
<IsA>app:web</IsA>
<PartOf>server.web</PartOf>
<Summary>Simple web interface to GIT repositories</Summary>
<RuntimeDependencies>
<Dependency version="current">git</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/var/www/localhost</Path>
<Path fileType="config">/etc/conf.d/gitweb</Path>
<Path fileType="config">/etc/apache2/conf.d</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/conf.d/gitweb">gitweb.confd</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/apache2/conf.d/git.conf">git.conf.httpd</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="17">
<Date>2015-06-20</Date>
<Version>2.4.4</Version>
<Comment>Version bump.</Comment>
<Name>Hakan Yıldız</Name>
<Email>hknyldz93@gmail.com</Email>
</Update>
<Update release="16">
<Date>2015-04-04</Date>
<Version>2.3.5</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="15">
<Date>2015-02-07</Date>
<Version>2.3.0</Version>
<Comment>Version bump.</Comment>
<Name>Hakan Yıldız</Name>
<Email>hknyldz93@gmail.com</Email>
</Update>
<Update release="14">
<Date>2014-09-19</Date>
<Version>2.2.2</Version>
<Comment>Version Bump.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="13">
<Date>2014-09-13</Date>
<Version>2.1.0</Version>
<Comment>Rebuild for new perl.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="12">
<Date>2014-08-16</Date>
<Version>2.1.0</Version>
<Comment>Version bump.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="11">
<Date>2014-06-25</Date>
<Version>2.0.1</Version>
<Comment>Version bump.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="10">
<Date>2014-06-01</Date>
<Version>2.0.0</Version>
<Comment>Version bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2014-02-15</Date>
<Version>1.9.0</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2014-02-11</Date>
<Version>1.8.5.4</Version>
<Comment>Version bump and new rsync</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2013-11-21</Date>
<Version>1.8.4.4</Version>
<Comment>Version bump.</Comment>
<Name>Richard de Bruin</Name>
<Email>richdb@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2013-10-29</Date>
<Version>1.8.4.2</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2013-09-21</Date>
<Version>1.8.3.2</Version>
<Comment>fix dep</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="4">
<Date>2013-07-04</Date>
<Version>1.8.3.2</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-04-08</Date>
<Version>1.8.2.1</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-01-29</Date>
<Version>1.8.1.2</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-12-28</Date>
<Version>1.8.0.3</Version>
<Comment>First release</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
</History>
</PISI>
+55
View File
@@ -0,0 +1,55 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>git</Name>
<Description xml:lang="tr">Git hızlı, ölçeklenebilir ve dağıtılmış, ve sık rastlanmayan zengin komut kümesi içeren, hem yüksek seviyeli işlemleri hem dahili işlemlere tam erişimi sağlayan bir sürüm kontrol sistemidir.</Description>
<Summary xml:lang="tr">Hızlı Sürüm Denetim Sistemi</Summary>
<Description xml:lang="es">GIT es un sistema rápido, escalable y distribuido de control de versiones con un amplio espectro de comandos que permite operaciones de alto nivel tanto como operaciones con acceso a detalles internos.</Description>
</Source>
<Package>
<Name>git-emacs</Name>
<Summary xml:lang="tr">emacs için GIT bütünleşmesi</Summary>
</Package>
<Package>
<Name>git-daemon</Name>
<Summary xml:lang="tr">GIT protokolü hizmeti</Summary>
</Package>
<Package>
<Name>perl-Git</Name>
<Summary xml:lang="tr">GIT için perl arayüzü</Summary>
</Package>
<Package>
<Name>emacs-Git</Name>
<Summary xml:lang="tr">Emacs için git desteği</Summary>
</Package>
<Package>
<Name>git-svn</Name>
<Summary xml:lang="tr">Subversion depolarıyla etkileşmek için gerekli Git araçları</Summary>
</Package>
<Package>
<Name>git-cvs</Name>
<Summary xml:lang="tr">CVS depolarıyla etkileşmek için gerekli Git araçları</Summary>
</Package>
<Package>
<Name>gitk</Name>
<Summary xml:lang="tr">Git sürüm ağacı görüntüleyici</Summary>
</Package>
<Package>
<Name>git-gui</Name>
<Summary xml:lang="tr">GIT için basit bir grafik arayüz</Summary>
</Package>
<Package>
<Name>gitweb</Name>
<Summary xml:lang="tr">GIT için Web arayüzü</Summary>
<Summary xml:lang="es">interfaz web para GIT</Summary>
</Package>
</PISI>