Skip to content

Commit 67ef7ab

Browse files
Merge pull request #37 from redBorder/development
Release 0.6.1
2 parents fdfc3ee + 6ed6f6f commit 67ef7ab

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.6.0
1+
0.6.1

packaging/rpm/redborder-proxy.spec

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,10 @@ install -D -m 0644 resources/systemd/rb-init-conf.service %{buildroot}/usr/lib/s
4646
install -D -m 0755 resources/lib/dhclient-enter-hooks %{buildroot}/usr/lib/redborder/lib/dhclient-enter-hooks
4747

4848
%pre
49-
if [ -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec ]; then
50-
cp -p /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec.backup
51-
fi
5249

5350
%post
54-
if [ -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec ]; then
55-
rm -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec
51+
if ls /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.* 1> /dev/null 2>&1; then
52+
rm -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.*
5653
fi
5754
case "$1" in
5855
1)
@@ -80,11 +77,6 @@ esac
8077
echo "kernel.printk = 1 4 1 7" > /usr/lib/sysctl.d/99-redborder-printk.conf
8178
/sbin/sysctl --system > /dev/null 2>&1
8279

83-
%postun
84-
if [ -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec.backup ]; then
85-
mv /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec.backup /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec
86-
fi
87-
8880
%posttrans
8981
update-alternatives --set java $(find /usr/lib/jvm/*java-1.8.0-openjdk* -name "java"|head -n 1)
9082

@@ -105,7 +97,9 @@ update-alternatives --set java $(find /usr/lib/jvm/*java-1.8.0-openjdk* -name "j
10597
%doc
10698

10799
%changelog
108-
* Fri Mar 28 2025 Vicente Mesa, José Navarro <vimesa@redborder.com, jnavarro@redborder.com> -
100+
* Tue Apr 22 2025 Rafael Gómez <rgomez@redborder.com> - 0.6.1-1
101+
- Remove openssl gemspec file handling from chef-workstation package
102+
* Fri Mar 28 2025 Vicente Mesa, José Navarro <vimesa@redborder.com, jnavarro@redborder.com> - 0.6.0-1
109103
- Chef-workstation update handling conflict with embedded openssl gemspec
110104
* Mon Apr 14 2025 Rafael Gómez <rgomez@redborder.com> - 0.5.0-1
111105
- Add domain configuration update during package upgrade for http2k

0 commit comments

Comments
 (0)