Skip to content

Commit bb6ae8b

Browse files
authored
Merge pull request #56 from redBorder/development
Bump to 3.1.0
2 parents 75d46ac + 735c74a commit bb6ae8b

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.1.0

packaging/rpm/redborder-ips.spec

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,14 @@ install -D -m 0644 resources/systemd/rb-init-conf.service %{buildroot}/usr/lib/s
4949
install -D -m 0755 resources/lib/dhclient-enter-hooks %{buildroot}/usr/lib/redborder/lib/dhclient-enter-hooks
5050

5151
%pre
52+
if [ -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec ]; then
53+
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
54+
fi
5255

5356
%post
57+
if [ -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec ]; then
58+
rm -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec
59+
fi
5460
case "$1" in
5561
1)
5662
# This is an initial install.
@@ -79,6 +85,11 @@ systemctl enable pf_ring && systemctl start pf_ring
7985
echo "kernel.printk = 1 4 1 7" > /usr/lib/sysctl.d/99-redborder-printk.conf
8086
/sbin/sysctl --system > /dev/null 2>&1
8187

88+
%postun
89+
if [ -f /opt/chef-workstation/embedded/lib/ruby/gems/3.1.0/specifications/default/openssl-3.0.1.gemspec.backup ]; then
90+
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
91+
fi
92+
8293
%files
8394
%defattr(0755,root,root)
8495
/usr/lib/redborder/bin
@@ -99,9 +110,10 @@ echo "kernel.printk = 1 4 1 7" > /usr/lib/sysctl.d/99-redborder-printk.conf
99110
%doc
100111

101112
%changelog
102-
* Mon Apr 14 2025 Rafael Gómez <rgomez@redborder.com> - 3.0.0-1
113+
* Fri Mar 28 2025 Vicente Mesa, José Navarro <vimesa@redborder.com, jnavarro@redborder.com> -
114+
- Chef update handling conflict with openssl
115+
* Mon Apr 14 2025 Rafael Gómez <rgomez@redborder.com>
103116
- Add domain configuration update during package upgrade for http2k
104-
105117
* Thu Dec 14 2023 Miguel Negrón <manegron@redborder.com> - 1.4.0-1
106118
- Set version for daq to 2.0.7
107119

0 commit comments

Comments
 (0)