Changes

From SME Server
Jump to navigationJump to search

Rpm build example using cvs/mock (view source)

Revision as of 21:27, 10 February 2014

6,408 bytes added ,  21:27, 10 February 2014
→‎Bug 7060
Line 604: Line 604:  
  [chris@bui work]$ cvs -z3 -d:pserver:anonymous@smeserver.cvs.sourceforge.net:/cvsroot/smeserver checkout -P e-smith-base
 
  [chris@bui work]$ cvs -z3 -d:pserver:anonymous@smeserver.cvs.sourceforge.net:/cvsroot/smeserver checkout -P e-smith-base
   −
  [chris@buildxxx work]$ cd e-smith-base/sme8/
+
  [chris@build-system work]$ cd e-smith-base/sme8/
−
  [chris@buildxxx sme8]$ cvs update -dPA
+
  [chris@build-system sme8]$ cvs update -dPA
   −
  [chris@buildxxx sme8]$ make clean
+
  [chris@build-system sme8]$ make clean
−
  [chris@buildxxx sme8]$ make prep
+
  [chris@build-system sme8]$ make prep
   −
  [chris@buildxxx sme8]$ cp -R e-smith-base-5.2.0 e-smith-base-5.2.0.old
+
  [chris@build-system sme8]$ cp -R e-smith-base-5.2.0 e-smith-base-5.2.0.old
   −
  [chris@buildxxx root]$ ll usr/lib/perl5/site_perl/esmith/console/
+
  [chris@build-system root]$ ll usr/lib/perl5/site_perl/esmith/console/
 
  total 104
 
  total 104
 
  -rw-r--r-- 1 chris chris  1761 Jan 27  2007 backup_running.pm
 
  -rw-r--r-- 1 chris chris  1761 Jan 27  2007 backup_running.pm
Line 625: Line 625:  
  -rw-r--r-- 1 chris chris  4867 Aug 21  2008 system_password.pm
 
  -rw-r--r-- 1 chris chris  4867 Aug 21  2008 system_password.pm
   −
  [chris@buildxxx root]$ nano usr/lib/perl5/site_perl/esmith/console/perform_restore.pm
+
  [chris@build-system root]$ nano usr/lib/perl5/site_perl/esmith/console/perform_restore.pm
    
* Original
 
* Original
Line 646: Line 646:  
  #use esmith::console;
 
  #use esmith::console;
   −
  [chris@buildxxx sme8]$ diff -urN e-smith-base-5.2.0.old e-smith-base-5.2.0 > e-smith-base-5.2.0-fire_post-upgrade_after_restore_process.patch
+
  [chris@build-system sme8]$ diff -urN e-smith-base-5.2.0.old e-smith-base-5.2.0 > e-smith-base-5.2.0-fire_post-upgrade_after_restore_process.patch
   −
  [chris@buildxxx sme8]$ cat e-smith-base-5.2.0-fire_post-upgrade_after_restore_process.patch
+
  [chris@build-system sme8]$ cat e-smith-base-5.2.0-fire_post-upgrade_after_restore_process.patch
 
  diff -urN e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm
 
  diff -urN e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm
 
  --- e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2013-02-06 08:11:54.926469195 +1100
 
  --- e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2013-02-06 08:11:54.926469195 +1100
Line 661: Line 661:  
  #use esmith::console;
 
  #use esmith::console;
   −
  [chris@buildxxx sme8]$ nano e-smith-base.spec  
+
  [chris@build-system sme8]$ nano e-smith-base.spec  
   −
  [chris@buildxxx sme8]$ cvs diff e-smith-base.spec
+
  [chris@build-system sme8]$ cvs diff e-smith-base.spec
 
  Index: e-smith-base.spec
 
  Index: e-smith-base.spec
 
  ===================================================================
 
  ===================================================================
Line 682: Line 682:  
  > %patch55 -p1
 
  > %patch55 -p1
   −
  [chris@buildxxx sme8]$ make mockbuild             
+
  [chris@build-system sme8]$ make mockbuild             
   −
  [chris@buildxxx sme8]$ ll e-smith-base-5_2_0-71_el5_sme
+
  [chris@build-system sme8]$ ll e-smith-base-5_2_0-71_el5_sme
 
  total 852
 
  total 852
 
  -rw-rw-r-- 1 chris chris 124407 Feb  6 09:01 build.log
 
  -rw-rw-r-- 1 chris chris 124407 Feb  6 09:01 build.log
Line 695: Line 695:  
Now we commit modifications
 
Now we commit modifications
   −
  [chris@buildxxx sme8]$ cvs update
+
  [chris@build-system sme8]$ cvs update
 
  ? e-smith-base-5.2.0
 
  ? e-smith-base-5.2.0
 
  ? e-smith-base-5.2.0-71.el5.sme.src.rpm
 
  ? e-smith-base-5.2.0-71.el5.sme.src.rpm
Line 703: Line 703:  
  M e-smith-base.spec
 
  M e-smith-base.spec
   −
  [chris@buildxxx sme8]$ cvs commit -m 'Bug 7060 - Post-upgrades not fired after restore from console'
+
  [chris@build-system sme8]$ cvs commit -m 'Bug 7060 - Post-upgrades not fired after restore from console'
 
  cvs commit: Examining .
 
  cvs commit: Examining .
 
  ? e-smith-base-5_2_0-71_el5_sme
 
  ? e-smith-base-5_2_0-71_el5_sme
Line 712: Line 712:     
Next: you need a source forge account + write access in CVS for project smeserver (base &/or contribs)
 
Next: you need a source forge account + write access in CVS for project smeserver (base &/or contribs)
 +
 +
====bug 6381====
 +
 +
Bug 6381 - Remove SSH v1 legacy support
 +
 +
sme9
 +
Package is e-smith-openssh-2.4.0
 +
Patch supplied
 +
 +
* Get package
 +
[chris@build-system work]$ cvs -z3 -d:ext:smeserver.cvs.sourceforge.net:/cvsroot/smeserver co -P e-smith-openssh
 +
 +
* Get patch from workstation to build:
 +
[chris@canopus exchange]$ ls
 +
e-smith-openssh-2.4.0-protocol_2.patch
 +
 +
[chris@canopus exchange]$ scp -P 22 e-smith-openssh-2.4.0-protocol_2.patch chris\@192.168.0.12:/home/chris/exchange
 +
chris@192.168.xxx.12's password:
 +
e-smith-openssh-2.4.0-protocol_2.patch 
 +
 +
* Prepare:
 +
[chris@build-system sme9]$ pwd
 +
/home/chris/work/e-smith-openssh/sme9
 +
[chris@build-system sme9]$ ls -la
 +
total 56
 +
drwxrwxr-x 3 chris chris  4096 Nov  1 14:19 .
 +
drwxrwxr-x 7 chris chris  4096 Nov  1 14:19 ..
 +
drwxrwxr-x 2 chris chris  4096 Nov  1 14:19 CVS
 +
-rw-rw-r-- 1 chris chris    29 Feb 15  2013 .cvsignore
 +
-rw-rw-r-- 1 chris chris  613 Mar 17  2013 e-smith-openssh-2.4.0-rsyslog.patch
 +
-rw-rw-r-- 1 chris chris 21295 Mar 17  2013 e-smith-openssh.spec
 +
-rw-rw-r-- 1 chris chris    92 Feb 15  2013 import.log
 +
-rw-rw-r-- 1 chris chris  838 Feb 15  2013 Makefile
 +
-rw-rw-r-- 1 chris chris    63 Feb 15  2013 sources
 +
 +
[chris@build-system sme9]$ cvs update -dPA
 +
cvs update: Updating .
 +
 +
[chris@build-system sme9]$ pushd ~/exchange/
 +
~/exchange ~/work/e-smith-openssh/sme9
 +
 +
* Copy patch to package:
 +
[chris@build-system sme9]$ pushd ~/exchange/
 +
~/exchange ~/work/e-smith-openssh/sme9
 +
 +
[chris@build-system exchange]$ cp e-smith-openssh-2.4.0-protocol_2.patch /home/chris/work/e-smith-openssh/sme9
 +
 +
[chris@build-system exchange]$ pushd
 +
~/work/e-smith-openssh/sme9 ~/exchange
 +
 +
[chris@build-system sme9]$ ls -la
 +
total 60
 +
drwxrwxr-x 3 chris chris  4096 Nov  1 14:28 .
 +
drwxrwxr-x 7 chris chris  4096 Nov  1 14:19 ..
 +
drwxrwxr-x 2 chris chris  4096 Nov  1 14:19 CVS
 +
-rw-rw-r-- 1 chris chris    29 Feb 15  2013 .cvsignore
 +
-rw-rw-r-- 1 chris chris  3749 Nov  1 14:23 e-smith-openssh-2.4.0-protocol_2.patch
 +
-rw-rw-r-- 1 chris chris  613 Mar 17  2013 e-smith-openssh-2.4.0-rsyslog.patch
 +
-rw-rw-r-- 1 chris chris 21295 Mar 17  2013 e-smith-openssh.spec
 +
-rw-rw-r-- 1 chris chris    92 Feb 15  2013 import.log
 +
-rw-rw-r-- 1 chris chris  838 Feb 15  2013 Makefile
 +
-rw-rw-r-- 1 chris chris    63 Feb 15  2013 sources
 +
 +
* Modify the spec file: update the release number, add a PatchXX line, add a changelog entry, add a %patch line
 +
%define release 3
 +
Patch2: e-smith-openssh-2.4.0-protocol_2.patch
 +
 +
* Fri Nov 1 2013 chris burnat <devlist@burnat.com> 2.4.0-3.sme
 +
- Remove SSH v1 legacy support - patch by Daniel Berteaud [SME: 6381]
 +
 +
%patch2 -p1
 +
 +
* Check:
 +
[chris@build-system sme9]$ cvs diff -u e-smith-openssh.spec
 +
 +
Index: e-smith-openssh.spec
 +
===================================================================
 +
RCS file: /cvsroot/smeserver/rpms/e-smith-openssh/sme9/e-smith-openssh.spec,v
 +
retrieving revision 1.3
 +
diff -u -r1.3 e-smith-openssh.spec
 +
--- e-smith-openssh.spec 16 Mar 2013 15:34:25 -0000 1.3
 +
+++ e-smith-openssh.spec 1 Nov 2013 03:42:17 -0000
 +
@@ -4,13 +4,14 @@
 +
%define name e-smith-openssh
 +
Name: %{name}
 +
%define version 2.4.0
 +
-%define release 2
 +
+%define release 3
 +
Version: %{version}
 +
Release: %{release}%{?dist}
 +
License: GPL
 +
Group: Networking/Daemons
 +
Source: %{name}-%{version}.tar.xz
 +
Patch1: e-smith-openssh-2.4.0-rsyslog.patch
 +
+Patch2: e-smith-openssh-2.4.0-protocol_2.patch
 +
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 +
BuildRequires: e-smith-devtools
 +
BuildArchitectures: noarch
 +
@@ -23,6 +24,9 @@
 +
AutoReqProv: no
 +
 
 +
%changelog
 +
+* Fri Nov 1 2013 Chris Burnat <devlist@burnat.com> 2.4.0-3.sme
 +
+- Remove SSH v1 legacy support - patch by Daniel Berteaud [SME: 6381]
 +
+
 +
* Sat Mar 16 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2.sme
 +
- Make rsyslog listen to our socket [SME: 7221]
 +
 +
@@ -595,6 +599,7 @@
 +
%prep
 +
%setup
 +
%patch1 -p1
 +
+%patch2 -p1
 +
 +
%build
 +
perl createlinks
 +
 +
 +
* Local build:
 +
 +
[chris@build-system sme9]$  make mockbuild
 +
 +
* Move package to worstation:
 +
[chris@build-system e-smith-openssh-2_4_0-3_el6_sme]$ pwd
 +
/home/chris/work/e-smith-openssh/sme9/e-smith-openssh-2_4_0-3_el6_sme
 +
 +
[chris@build-system e-smith-openssh-2_4_0-3_el6_sme]$ ls -la
 +
total 864
 +
drwxrwxr-x 2 chris chris  4096 Nov  1 14:50 .
 +
drwxrwxr-x 4 chris chris  4096 Nov  1 14:43 ..
 +
-rw-rw-r-- 1 root  root  681992 Nov  1 14:48 available_pkgs
 +
-rw-rw-r-- 1 chris chris  20336 Nov  1 14:49 build.log
 +
-rw-rw-r-- 1 chris mock  49496 Nov  1 14:49 e-smith-openssh-2.4.0-3.el6.sme.noarch.rpm <----HERE!
 +
-rw-rw-r-- 1 chris mock  43723 Nov  1 14:48 e-smith-openssh-2.4.0-3.el6.sme.src.rpm
 +
-rw-rw-r-- 1 chris mock  15832 Nov  1 14:49 installed_pkgs
 +
-rw-rw-r-- 1 chris chris  51640 Nov  1 14:49 root.log
 +
-rw-rw-r-- 1 chris chris  1670 Nov  1 14:49 state.log
 +
 +
[chris@build-system e-smith-openssh-2_4_0-3_el6_sme]$ scp -P 22 e-smith-openssh-2.4.0-3.el6.sme.noarch.rpm chris\@192.168.0.1:/home/chris/WIP
 +
chris@192.168.0.1's password:
 +
e-smith-openssh-2.4.0-3.el6.sme.noarch.rpm             
 +
 +
* Move package to an ibay (testing) on test server and install:
 +
[root@test90b2 files]# rpm -Uvh e-smith-openssh-2.4.0-3.el6.sme.noarch.rpm
 +
Preparing...                ########################################### [100%]
 +
  1:e-smith-openssh        ########################################### [100%]
 +
 +
[root@test90b2 files]# signal-event post-upgrade; signal-event reboot
 +
 +
[root@test90b2 files]# rpm -qa e-smith-openssh
 +
e-smith-openssh-2.4.0-3.el6.sme.noarch
 +
 +
* Sanity check:
 +
[root@test90b2 ~]# config show sshd
 +
sshd=service
 +
    LoginGraceTime=600
 +
    MaxAuthTries=2
 +
    PasswordAuthentication=yes
 +
    PermitRootLogin=yes
 +
    Protocol=2
 +
    TCPPort=22
 +
    UsePAM=yes
 +
    access=private
 +
    status=enabled
 +
 +
* Add to CVS and build:
 +
[chris@build-system sme9]$ cvs add e-smith-openssh-2.4.0-protocol_2.patch
 +
cvs add: scheduling file `e-smith-openssh-2.4.0-protocol_2.patch' for addition
 +
cvs add: use 'cvs commit' to add this file permanently
 +
 +
[chris@build-system sme9]$ make commit tag build
 +
[snip]
 +
 +
/usr/bin/plague-client build e-smith-openssh e-smith-openssh-2_4_0-3_el6_sme sme9
 +
Package e-smith-openssh enqueued.  Job ID: 3651.
 +
 +
Fixed in e-smith-openssh-2.4.0-3.sme
 +
%changelog
 +
* Fri Nov 1 2013 chris burnat <devlist@burnat.com> 2.4.0-3.sme
 +
- Remove SSH v1 legacy support - patch by Daniel Berteaud [SME: 6381]
    
===PORTING FROM SME8 TO SME9 - CAUTION===
 
===PORTING FROM SME8 TO SME9 - CAUTION===
Retrieved from "https://wiki.koozali.org/Special:MobileDiff/23647"

Navigation menu