From af49ed8a1d528432d47eae7a53b31a44c927d8ba Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Jul 06 2016 15:33:47 +0000 Subject: Ticket 48762 - 389-admin uses HTTP to download content from git (should use HTTPS) Description: Use https protocol for downloading content https://fedorahosted.org/389/ticket/48762 Reviewed by: mreynolds (one line commit rule) --- diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 0c67d30..918d705 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.35 +VERSION=1.1.42 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 0b5093e..40f9f75 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,12 +1,12 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.35 +VERSION=1.1.42 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION TAG=${PKGNAME}-${VERSION} -URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz" +URL="https://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz" wget -O $SRCNAME.tar.gz "$URL" diff --git a/389-admin.spec b/389-admin.spec index a4eff7a..4f54572 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -13,7 +13,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.42 -Release: %{?relprefix}1%{?prerel}%{?dist}.6 +Release: %{?relprefix}1%{?prerel}%{?dist}.7 License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -46,9 +46,8 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2 # 389-admin-git.sh should be used to generate the source tarball from git -Source1: %{name}-git.sh +Source0: %{name}-git.sh %description 389 Administration Server is an HTTP agent that provides management features @@ -128,6 +127,9 @@ end %{_mandir}/man8/* %changelog +* Wed Jul 06 2016 Mark Reyniolds - 1.1.42-1.7 +- Replace http with https when downloading content from git + * Wed Jul 06 2016 Marcin Juszkiewicz - 1.1.42-1.6 - Drop USE_64 variable as it is not used anymore.