[packages/gitlab-ce] up to 9.1.1, rugged patching no longer needed

Sun Apr 30 19:21:25 CEST 2017

commit 17eadde9207e96e35dc1fb67724e7f98ee69ef42
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 29 02:14:24 2017 +0300

    up to 9.1.1, rugged patching no longer needed

 clean-vendor.sh |  3 ++-
 gitlab-ce.spec  | 33 ++++++---------------------------
 pld.patch       | 18 ++++++------------
 3 files changed, 14 insertions(+), 40 deletions(-)
---

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 07f7d8c..05a5694 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -14,14 +14,14 @@
 %bcond_with	krb5		# build with kerberos support
 %bcond_without	gem_cache	# use local cache to speedup gem installation
 
-%define	shell_version 5.0.0
-%define	workhorse_version 1.4.2
+%define	shell_version 5.0.2
+%define	workhorse_version 1.4.3
 %define	pages_version 0.4.0
-%define	gitaly_version 0.3.0
+%define	gitaly_version 0.6.0
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
-Version:	9.0.6
-Release:	0.96
+Version:	9.1.1
+Release:	0.100
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -139,12 +139,6 @@ bundle install %{_smp_mflags} \
 	--deployment \
 	--without development test aws %{!?with_krb5:kerberos}
 
-# install newer rugged to fix diff view showing garbage
-# https://gitlab.com/gitlab-org/gitlab-ce/issues/14972
-v=0.25.0b7
-test -d vendor/bundle/ruby/gems/rugged-$v || \
-bundle exec gem install -v $v rugged --no-rdoc --no-ri --verbose
-
 # install webpack deps, used later by rake webpack:compile:
 # node_modules/.bin/webpack --config config/webpack.config.js --bail
 # see vendor/bundle/ruby/gems/webpack-rails-0.9.9/lib/tasks/webpack.rake
@@ -178,7 +172,6 @@ cp -aul vendor/bundle/* "$cachedir"
 rm -rf $RPM_BUILD_ROOT
 install -d \
 	$RPM_BUILD_ROOT%{appdir}/public/{assets,uploads} \
-	$RPM_BUILD_ROOT%{appdir}/satellites \
 	$RPM_BUILD_ROOT%{appdir}/tmp/{cache/assets,sessions,backups} \
 	$RPM_BUILD_ROOT%{appdir}/shared/tmp/project_exports \
 	$RPM_BUILD_ROOT%{_sysconfdir}/gitlab \
@@ -199,18 +192,6 @@ cp -a$l . $RPM_BUILD_ROOT%{appdir}
 # cleanup unneccessary cruft (gem build files, etc)
 sh -x %{SOURCE12} $RPM_BUILD_ROOT%{appdir}
 
-# replace the contents, yet leave it believe it has proper version installed (for gem dependencies)
-v=0.25.0b7
-ov=0.24.0
-rv=%{ruby_version}
-#rd=%{appdir}/vendor/bundle/ruby
-rd=%{appdir}/vendor/bundle/ruby/$rv
-
-rm -r $RPM_BUILD_ROOT$rd/extensions/%{_arch}-linux/$rv/rugged-$ov
-   mv $RPM_BUILD_ROOT$rd/extensions/%{_arch}-linux/$rv/rugged-{$v,$ov}
-rm -r $RPM_BUILD_ROOT$rd/gems/rugged-$ov
-   mv $RPM_BUILD_ROOT$rd/gems/rugged-{$v,$ov}
-
 # rpm cruft from repackaging
 rm -f $RPM_BUILD_ROOT%{appdir}/debug*.list
 
@@ -242,7 +223,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/gitlab/skip-auto-migrations
 # relocate to /etc as it's updated runtime, see 77cff54
 move_symlink %{appdir}/db/schema.rb %{_sysconfdir}/gitlab/schema.rb
 
-for a in satellites builds shared tmp public/{uploads,assets}; do
+for a in builds shared tmp public/{uploads,assets}; do
 	move_symlink %{appdir}/$a %{vardir}/$a
 done
 
@@ -374,10 +355,8 @@ fi
 %{appdir}/public
 %{appdir}/shared
 %{appdir}/tmp
-%{appdir}/satellites
 
 %{vardir}/.gitconfig
-%dir %attr(755,%{uname},%{gname}) %{vardir}/satellites
 %dir %attr(755,%{uname},%{gname}) %{vardir}/builds
 %dir %{vardir}/public
 %attr(-,%{uname},%{gname}) %{vardir}/public/uploads
diff --git a/clean-vendor.sh b/clean-vendor.sh
index 30d725a..ff32179 100755
--- a/clean-vendor.sh
+++ b/clean-vendor.sh
@@ -7,12 +7,14 @@ set -e
 # clean files not related for running gitlab
 clean_rootfiles() {
 	cd $root
+	rm -r .babelrc
 	rm -r .github
 	rm -r .gitlab
 	rm -r changelogs
 	rm -r docker
 	rm -r features
 	rm -r lib/support
+	rm -r qa
 	rm -r rubocop
 	rm -r scripts
 	rm -r spec
@@ -21,7 +23,6 @@ clean_rootfiles() {
 	rm .eslintrc
 	rm .flayignore
 	rm .foreman
-	rm .gitattributes
 	rm .gitignore
 	rm .gitlab-ci.yml
 	rm .haml-lint.yml
diff --git a/pld.patch b/pld.patch
index 79d7938..94ba5c8 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- gitlab-ce-9.0.5/config/gitlab.yml~	2017-04-19 19:24:05.000000000 +0300
-+++ gitlab-ce-9.0.5/config/gitlab.yml	2017-04-19 20:10:23.905562742 +0300
+--- gitlab-ce-9.1.1/config/gitlab.yml~	2017-04-29 02:18:23.000000000 +0300
++++ gitlab-ce-9.1.1/config/gitlab.yml	2017-04-29 02:22:07.666017631 +0300
 @@ -30,8 +30,10 @@
    gitlab:
      ## Web server settings (note: host is the FQDN, do not include http://)
@@ -22,21 +22,15 @@
  
      ## Date & Time settings
      # Uncomment and customize if you want to change the default time zone of GitLab application.
-@@ -462,7 +464,7 @@
-   # least. This setting is fed to 'rm -rf' in
-   # db/migrate/20151023144219_remove_satellites.rb
-   satellites:
--    path: /home/git/gitlab-satellites/
-+    path: /var/lib/gitlab/satellites/
- 
-   ## Repositories settings
-   repositories:
-@@ -472,7 +474,7 @@
+@@ -465,8 +465,9 @@
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
 -        path: /home/git/repositories/
+-        gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
 +        path: /var/lib/gitlab/repositories/
++        # TCP connections are supported too (e.g. tcp://host:port)
++        # gitaly_address: unix:/var/run/gitlab/private/gitaly.socket
  
    ## Backup settings
    backup:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/17eadde9207e96e35dc1fb67724e7f98ee69ef42

