Adding zlib dependency, updating .install, and adjusting formatting

3 files changed, 23 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85006882e85c..a66314d6802c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = git-git
 	pkgdesc = A fast distributed version control system
-	pkgver = 2.27.0.rc2.r128.g56219baf1e
+	pkgver = 2.37.2.r426.g07ee72db0e
 	pkgrel = 1
-	url = http://git-scm.com/
+	url = https://git-scm.com/
 	install = git-git.install
 	arch = i686
 	arch = x86_64
@@ -21,22 +21,23 @@ pkgbase = git-git
 	depends = pcre2
 	depends = grep
 	depends = shadow
+	depends = zlib
 	optdepends = tk: gitk and git gui
 	optdepends = perl-libwww: git svn
-	optdepends = perl-term-readkey: git svn
-	optdepends = perl-mime-tools: git send-email
-	optdepends = perl-net-smtp-ssl: git send-email TLS support
+	optdepends = perl-term-readkey: git svn and interactive.singlekey setting
+	optdepends = perl-io-socket-ssl: git send-email TLS support
 	optdepends = perl-authen-sasl: git send-email TLS support
 	optdepends = perl-mediawiki-api: git mediawiki support
 	optdepends = perl-datetime-format-iso8601: git mediawiki support
 	optdepends = perl-lwp-protocol-https: git mediawiki https support
 	optdepends = perl-cgi: gitweb (web interface) support
-	optdepends = python: various helper scripts
+	optdepends = python: git svn & git p4
 	optdepends = subversion: git svn
 	optdepends = org.freedesktop.secrets: keyring credential helper
 	optdepends = libsecret: libsecret credential helper
 	provides = git
 	conflicts = git
+	options = debug
 	source = git+https://github.com/git/git.git
 	source = git-daemon@.service
 	source = git-daemon.socket
@@ -47,4 +48,3 @@ pkgbase = git-git
 	sha512sums = 4d4b434c2c317388ed6d3bdd87b1e8acb6c845b58be7bd1466e73a210cc824d53185fad302c5fffc1328f0c25300050843f343f37d36700a981e3c11322ea0cc
 
 pkgname = git-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 434ee7f3944b..e975f52c23a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,31 @@
 
 _name=git
 pkgname=$_name-git
-pkgver=2.27.0.rc2.r128.g56219baf1e
+pkgver=2.37.2.r426.g07ee72db0e
 pkgrel=1
 pkgdesc='A fast distributed version control system'
 arch=('i686' 'x86_64')
-url='http://git-scm.com/'
+url='https://git-scm.com/'
 license=('GPL2')
 depends=('curl' 'expat' 'perl-error' 'perl' 'openssl'
-         'perl-mailtools' 'pcre2' 'grep' 'shadow')
+         'perl-mailtools' 'pcre2' 'grep' 'shadow' 'zlib')
 makedepends=('python' 'xmlto' 'asciidoc' 'libgnome-keyring' 'git')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
-            'perl-term-readkey: git svn'
-            'perl-mime-tools: git send-email'
-            'perl-net-smtp-ssl: git send-email TLS support'
+            'perl-term-readkey: git svn and interactive.singlekey setting'
+            'perl-io-socket-ssl: git send-email TLS support'
             'perl-authen-sasl: git send-email TLS support'
             'perl-mediawiki-api: git mediawiki support'
             'perl-datetime-format-iso8601: git mediawiki support'
             'perl-lwp-protocol-https: git mediawiki https support'
             'perl-cgi: gitweb (web interface) support'
-            'python: various helper scripts'
+            'python: git svn & git p4'
             'subversion: git svn'
             'org.freedesktop.secrets: keyring credential helper'
             'libsecret: libsecret credential helper')
 conflicts=('git')
 provides=('git')
+options=('debug')
 install=git-git.install
 source=('git+https://github.com/git/git.git'
         'git-daemon@.service'
@@ -38,12 +38,6 @@ sha512sums=('SKIP'
             'bd4aff421e547044a2a91b8a77c86ce14f05321008aa2e28aab35154b297803ca716ccba3e0fca3805033d4adb455adb41086ceeca98200b8006582c13f2c7d3'
             '4d4b434c2c317388ed6d3bdd87b1e8acb6c845b58be7bd1466e73a210cc824d53185fad302c5fffc1328f0c25300050843f343f37d36700a981e3c11322ea0cc')
 
-pkgver() {
-  cd "$srcdir/$_name"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-
 _make_paths=(
   prefix='/usr'
   gitexecdir='/usr/lib/git-core'
@@ -53,12 +47,17 @@ _make_paths=(
 _make_options=(
   CFLAGS="$CFLAGS"
   LDFLAGS="$LDFLAGS"
-  USE_LIBPCRE2=1
-  NO_PERL_CPAN_FALLBACKS=1
-  MAN_BOLD_LITERAL=1
   INSTALL_SYMLINKS=1
+  MAN_BOLD_LITERAL=1
+  NO_PERL_CPAN_FALLBACKS=1
+  USE_LIBPCRE2=1
 )
 
+pkgver() {
+  cd "$srcdir/$_name"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build() {
   cd "$srcdir/$_name"
 
@@ -96,6 +95,7 @@ check() {
 
 package() {
   cd "$srcdir/$_name"
+
   make \
     "${_make_paths[@]}" \
     "${_make_options[@]}" \
diff --git a/git-git.install b/git-git.install
index 3680c79dbf2d..a1de1fede20a 100644
--- a/git-git.install
+++ b/git-git.install
@@ -1,17 +1,9 @@
 #!/bin/sh
 
 post_install() {
-  systemd-sysusers git.conf
-
   if ! grep -qe '^/usr/bin/git-shell$' etc/shells; then
     echo '/usr/bin/git-shell' >> etc/shells
   fi
-
-  chsh -s /usr/bin/git-shell git
-}
-
-post_upgrade() {
-  post_install $1
 }
 
 post_remove() {