mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-18 13:23:57 +02:00
gitolite: update to 3.6.13
- Use git for sources since no proper tarball is available - Switch package URL to HTTPS - Refresh the patch Signed-off-by: krant <aleksey.vasilenko@gmail.com>
This commit is contained in:
parent
ecc8d12076
commit
a32fa4998a
|
@ -8,12 +8,13 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gitolite
|
PKG_NAME:=gitolite
|
||||||
PKG_VERSION:=3.6.11
|
PKG_VERSION:=3.6.13
|
||||||
PKG_RELEASE:=3
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_HASH:=2166a61b14de19e605b14f4a13a070fbfd5ecd247b6fd725108f111198a2c121
|
PKG_SOURCE_URL:=https://github.com/sitaramc/gitolite.git
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/sitaramc/gitolite/tar.gz/v$(PKG_VERSION)?
|
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
||||||
|
PKG_MIRROR_HASH:=f4ac58bc11fde65ef2c6a07f84af214989324147c4aa117ae1483ba0453e402f
|
||||||
|
|
||||||
PKG_CPE_ID:=cpe:/a:sitaram_chamarty:gitolite
|
PKG_CPE_ID:=cpe:/a:sitaram_chamarty:gitolite
|
||||||
|
|
||||||
|
@ -39,7 +40,7 @@ define Package/gitolite
|
||||||
+perlbase-utf8 \
|
+perlbase-utf8 \
|
||||||
|
|
||||||
TITLE:=Easy administration of git repositories
|
TITLE:=Easy administration of git repositories
|
||||||
URL:=http://gitolite.com/gitolite
|
URL:=https://gitolite.com/gitolite/
|
||||||
USERID:=git=382:git=382
|
USERID:=git=382:git=382
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
|
||||||
+ while ( $pos <= length($keydata) ) {
|
+ while ( $pos <= length($keydata) ) {
|
||||||
+ $partlen = unpack('N', substr $keydata, $pos, 4) or last;
|
+ $partlen = unpack('N', substr $keydata, $pos, 4) or last;
|
||||||
+ $data = unpack('s>*', substr $keydata, $pos + 4, 4) or last;
|
+ $data = unpack('s>*', substr $keydata, $pos + 4, 4) or last;
|
||||||
+ $pos = $pos + 4 + $partlen;
|
+ $pos = $pos + 4 + $partlen;
|
||||||
+ push @keyparts, $data;
|
+ push @keyparts, $data;
|
||||||
+ }
|
+ }
|
||||||
+ return ( $algorithm, @keyparts );
|
+ return ( $algorithm, @keyparts );
|
||||||
|
@ -54,18 +54,18 @@ Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
|
||||||
+# If the file cannot be parsed it will be undef
|
+# If the file cannot be parsed it will be undef
|
||||||
+# Returns (restrictions, algorithm, PEMkey, comment)
|
+# Returns (restrictions, algorithm, PEMkey, comment)
|
||||||
+sub ssh_parse_line($) {
|
+sub ssh_parse_line($) {
|
||||||
+ my $ssh_line = shift;
|
+ my $ssh_line = shift;
|
||||||
+ my @ssh_parts = split / /, $ssh_line, 5;
|
+ my @ssh_parts = split / /, $ssh_line, 5;
|
||||||
+ if (scalar @ssh_parts < 4) {
|
+ if (scalar @ssh_parts < 4) {
|
||||||
+ @ssh_parts = ('', @ssh_parts);
|
+ @ssh_parts = ('', @ssh_parts);
|
||||||
+ }
|
+ }
|
||||||
+ if (scalar @ssh_parts > 4) {
|
+ if (scalar @ssh_parts > 4) {
|
||||||
+ @ssh_parts = @ssh_parts[0,3]
|
+ @ssh_parts = @ssh_parts[0,3]
|
||||||
+ }
|
+ }
|
||||||
+ if (scalar @ssh_parts < 4) {
|
+ if (scalar @ssh_parts < 4) {
|
||||||
+ @ssh_parts = undef;
|
+ @ssh_parts = undef;
|
||||||
+ }
|
+ }
|
||||||
+ return ( @ssh_parts );
|
+ return ( @ssh_parts );
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+# ----------------------------------------------------------------------
|
+# ----------------------------------------------------------------------
|
||||||
|
@ -95,7 +95,7 @@ Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
|
||||||
my $in = shift;
|
my $in = shift;
|
||||||
-f $in or die "file not found: $in\n";
|
-f $in or die "file not found: $in\n";
|
||||||
my $fh;
|
my $fh;
|
||||||
- open( $fh, "ssh-keygen -l -f $in |" ) or die "could not fork: $!\n";
|
- open( $fh, "ssh-keygen -l -f $in 2>&1 |" ) or die "could not fork: $!\n";
|
||||||
+ open( $fh, $in ) or die "could not open $in: $!\n";
|
+ open( $fh, $in ) or die "could not open $in: $!\n";
|
||||||
my $output = <$fh>;
|
my $output = <$fh>;
|
||||||
chomp $output;
|
chomp $output;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user