Changes

10,648 bytes added , 06:27, 18 November 2017

Update CVS server details

Line 1: Line 1: −

{{Note box|All these examples are done by ~~xyz~~ Burnat who has kindly shared his notes for all those who want to understand and learn how work our build environment, please see other links below to get more details}}

{{Note box|All these examples are done by chris Burnat who has kindly shared his notes for all those who want to understand and learn how work our build environment, please see other links below to get more details}}

==BUILD SERVER USAGE==

Line 8: Line 8:

http://wiki.contribs.org/Package_Modification#Make_a_patch

http://wiki.contribs.org/Simple_Package_Modification

http://wiki.contribs.org/CVS

http://fedoraproject.org/wiki/Using_Mock_to_test_package_builds

http://www.openfusion.net/linux/mocking_rpms

http://fedoraproject.org/wiki/Projects/Mock

−

~~https://sourceforge.net/apps/trac/sourceforge/wiki/Register%20a%20user%20account ~~

−

~~https://sourceforge.net/apps/trac/sourceforge/wiki/CVS ~~

−

~~https://sourceforge.net/apps/trac/sourceforge/wiki/SSH%20keys ~~

Line 28: Line 25:

* Users and password

Root = xxxxxx

−

~~xyz~~ = xxxxxxxx

chris = xxxxxxxx

IP = 192.168.xx.12

Source Forge xxxxxxx

−

* Buildsys:

−

~~ssh -l xxxxxxxx shell.contribs.org~~

−

~~Pass: xxxxxxxxxxx~~

*Logon as root

* Log to server over ssh from ubuntu workstation:

−

~~xyz~~@~~canoxxx~~:~$ slogin -p 22 root\@192.168.xx.12

chris@ubuntu-desktop:~$ slogin -p 22 root\@192.168.xx.12

root@192.168.xx.12's password: xxxx

Last login: Tue Feb 5 17:22:42 2013 from pc-00001.burnat.xxx

−

*Login as user ~~xyz~~

*Login as user chris

−

~~xyz~~@~~canoxxx~~:~$ slogin -p 22 ~~xyz~~\@192.168.xx.12

chris@ubuntu-desktop:~$ slogin -p 22 chris\@192.168.xx.12

−

~~xyz~~@192.168.xxx.12's password: xxxx

chris@192.168.xxx.12's password: xxxx

Last login: Tue Mar 5 11:31:47 2013

* Sudo

−

[~~xyz~~@~~buildxxxx~~ ~]$ sudo yum update

[chris@build-system ~]$ sudo yum update

−

[sudo] password for ~~xyz~~: xxxx

[sudo] password for chris: xxxx

No Packages marked for Update

* Changeroot Environments (cd /etc/mock/)

−

[chris@build-system ~]$ cd /etc/mock/

-rw-r--r-- 1 root root 1751 Nov 2 07:59 logging.ini

−

-rw-r--r-- 1 root mock 6730 Jan 25 06:57 site-defaults.cfgHost shell.contribs.org

-rw-r--r-- 1 root mock 6730 Jan 25 06:57 site-defaults.cfgHost shell.contribs.org User xxxxx

−

User ~~cburnat~~

-rw-r--r-- 1 root mock 1626 Jul 26 2012 smeserver-7-i386-base.cfg

-rw-r--r-- 1 root mock 2169 Jul 27 2012 smeserver-7-i386-iso.cfg

Line 79: Line 71:

===USING CVS - GETTING SOURCE CODES===

CVS is used for maintaining code and packages.

−

We first need to download (with CVS this is called retrieving) the code for the package to be modified from the SME Server CVS repository at ~~SourceForge~~ (we can also retrieve the CVS for the smecontribs tree).

We first need to download (with CVS this is called retrieving) the code for the package to be modified from the SME Server CVS repository at shell.koozali.org(we can also retrieve the CVS for the smecontribs tree).

Two cases with CVS:

−

* To be able to work on your code in the SME Server CVS repository you need an account on ~~SourceForge~~. If you do not have an account at CVS, retrieving is performed as an anonymous user and changes cannot be saved.

* To be able to work on your code in the SME Server CVS repository you need an account on koozali.org. If you do not have an account at CVS, retrieving is performed as an anonymous user and changes cannot be saved.

−

slogin -p 22 ~~xyz~~\@192.168.xx.12

slogin -p 22 chris\@192.168.xx.12

Note: If at a later stage you obtain a valid account with CVS, you will need to edit ALL packages /CVS/Root in order to save your work in CVS. As an example, for package "e-smith-backup", CVS/Root will need to be edited to be exactly as shown below:

−

[~~xyz~~@~~buildxxxx~~ testsf]$ cat e-smith-backup/CVS/Root

[chris@build-system testsf]$ cat e-smith-backup/CVS/Root

−

:ext:~~smeserver.cvs~~.~~sourceforge~~.~~net~~:/~~cvsroot~~/smeserver

:ext:shell.koozali.org:/cvs/smeserver

[ok - CVS/Root uses 'ext' which should be SSH access]

* To retrieve a package or a full tree as an anonymous user, cd into a work directory and issue following commands:

−

cvs -z3 -d:pserver:anonymous@~~smeserver~~.~~cvs~~.~~sourceforge.net~~:/~~cvsroot~~/smeserver checkout -P e-smith-backup

for smeserver

−

cvs -z3 -d:pserver:anonymous@smeserver.cvs.~~sourceforge~~.~~net~~:/~~cvsroot~~/~~smeserver~~ co -P rpms

cvs -z3 -d:pserver:anonymous@shell.koozali.org:/cvs/smeserver checkout -P e-smith-backup

cvs -z3 -d:pserver:anonymous@shell.koozali.org:/cvs/smeserver co -P rpms

or for smecontribs

cvs -z3 -d:pserver:anonymous@shell.koozali.org:/cvs/smecontribs checkout -P e-smith-backup

cvs -z3 -d:pserver:anonymous@shell.koozali.org:/cvs/smecontribs co -P rpms

* To retrieve a package or a full tree as a registered user, cd into a work directory and issue following commands:

−

cvs -z3 -d:ext:~~smeserver.cvs~~.~~sourceforge~~.~~net~~:/~~cvsroot~~/smeserver co -P e-smith-backup

for smeserver

−

cvs -z3 -d:ext:smeserver.cvs.~~sourceforge~~.~~net~~:/~~cvsroot~~/~~smeserver~~ co -P rpms

cvs -z3 -d:ext:shell.koozali.org:/cvs/smeserver co -P e-smith-backup

cvs -z3 -d:ext:shell.koozali.org:/cvs/smeserver co -P rpms

or for smecontribs

cvs -z3 -d:ext:shell.koozali.org:/cvs/smecontribs co -P smeserver-diskusage

cvs -z3 -d:ext:shell.koozali.org:/cvs/smecontribs co -P rpms

===PACKAGE MODIFICATION===

* Import cvs in your workspace

−

You can use /home/~~xyz~~/testsf or whatever suits.

You can use /home/chris/testsf or whatever suits.

−

[~~xyz~~@~~buildxxxx~~ ~]$ mkdir work

[chris@build-system ~]$ mkdir work

−

[~~xyz~~@~~buildxxxx~~ ~]$ cd work/

[chris@build-system ~]$ cd work/

−

[~~xyz~~@~~buildxxxx~~ testsf]$ cvs -z3 -d:ext:~~smeserver.cvs~~.~~sourceforge~~.~~net~~:/~~cvsroot~~/smeserver co -P e-smith-backup

[chris@build-system testsf]$ cvs -z3 -d:ext:shell.koozali.org:/cvs/smeserver co -P e-smith-backup

* To refresh run the following from the rpms directory, or any lower directory with a CVS dir

−

[~~xyz~~@~~buildxxxx~~ ~] cd e-smith-backup/

[chris@build-system ~] cd e-smith-backup/

−

[~~xyz~~@~~buildxxxx~~ e-smith-backup]$ cvs update -dPA

[chris@build-system e-smith-backup]$ cvs update -dPA

* Change to work directory

−

[~~xyz~~@~~buildxxxx~~ e-smith-backup] cd sme9

[chris@build-system e-smith-backup] cd sme9

* To prepare a tree

−

[~~xyz~~@~~buildxxxx~~ sme9]$ cvs update -dPA

[chris@build-system sme9]$ cvs update -dPA

−

[~~xyz~~@~~buildxxxx~~ sme9]$ make clean [ignore errors about tar.xz:file missing]

[chris@build-system sme9]$ make clean [ignore errors about tar.xz:file missing]

−

[~~xyz~~@~~buildxxxx~~ sme9]$ make prep

[chris@build-system sme9]$ make prep

* Make a patch

Line 124: Line 124:

cp -R e-smith-backup-2.4.0 e-smith-backup-2.4.0.old

−

[~~xyz~~@~~buildxxxx~~ sme9]$ ls -la

[chris@build-system sme9]$ ls -la

−

drwxrwxr-x 2 ~~xyz xyz~~ 4096 Apr 2 14:07 CVS

drwxrwxr-x 2 chris chris 4096 Apr 2 14:07 CVS

−

-rw-rw-r-- 1 ~~xyz xyz~~ 28 Feb 14 02:42 .cvsignore

-rw-rw-r-- 1 chris chris 28 Feb 14 02:42 .cvsignore

−

drwxr-xr-x 3 ~~xyz xyz~~ 4096 Feb 14 02:24 e-smith-backup-2.4.0

drwxr-xr-x 3 chris chris 4096 Feb 14 02:24 e-smith-backup-2.4.0

−

drwxrwxr-x 2 ~~xyz xyz~~ 4096 Apr 1 17:12 e-smith-backup-2_4_0-4_el6_sme

drwxrwxr-x 2 chris chris 4096 Apr 1 17:12 e-smith-backup-2_4_0-4_el6_sme

−

-rw-rw-r-- 1 ~~xyz xyz~~ 93816 Apr 1 17:23 e-smith-backup-2.4.0-4.el6.sme.src.rpm

-rw-rw-r-- 1 chris chris 93816 Apr 1 17:23 e-smith-backup-2.4.0-4.el6.sme.src.rpm

−

-rw-rw-r-- 1 ~~xyz xyz~~ 902 Mar 21 15:30 e-smith-backup-2.4.0-CIFS_UNC_Path.patch

-rw-rw-r-- 1 chris chris 902 Mar 21 15:30 e-smith-backup-2.4.0-CIFS_UNC_Path.patch

−

-rw-rw-r-- 1 ~~xyz xyz~~ 730 Mar 1 17:21 e-smith-backup-2.4.0-df_ext4.patch

-rw-rw-r-- 1 chris chris 730 Mar 1 17:21 e-smith-backup-2.4.0-df_ext4.patch

−

-rw-rw-r-- 1 ~~xyz xyz~~ 663 Apr 1 16:38 e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch

-rw-rw-r-- 1 chris chris 663 Apr 1 16:38 e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch

−

-rw-rw-r-- 1 ~~xyz xyz~~ 38424 Feb 14 02:35 e-smith-backup-2.4.0.tar.xz

-rw-rw-r-- 1 chris chris 38424 Feb 14 02:35 e-smith-backup-2.4.0.tar.xz

−

-rw-r--r-- 1 ~~xyz xyz~~ 44999 Apr 2 14:07 e-smith-backup.spec

-rw-r--r-- 1 chris chris 44999 Apr 2 14:07 e-smith-backup.spec

−

-rw-rw-r-- 1 ~~xyz xyz~~ 90 Feb 14 02:42 import.log

-rw-rw-r-- 1 chris chris 90 Feb 14 02:42 import.log

−

-rw-rw-r-- 1 ~~xyz xyz~~ 836 Feb 14 02:42 Makefile

-rw-rw-r-- 1 chris chris 836 Feb 14 02:42 Makefile

−

-rw-rw-r-- 1 ~~xyz xyz~~ 62 Feb 14 02:42 sources

-rw-rw-r-- 1 chris chris 62 Feb 14 02:42 sources

* Switch to the tree and make required modification:

Create a patch using a sensible name, eg "e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch":

−

[~~xyz~~@~~buildxxxx~~ sme9]$ diff -urN e-smith-backup-2.4.0.old e-smith-backup-2.4.0 > e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch

[chris@build-system sme9]$ diff -urN e-smith-backup-2.4.0.old e-smith-backup-2.4.0 > e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch

* Update the spec file

−

[~~xyz~~@~~buildxxxx~~ sme9]$ nano e-smith-backup.spec

[chris@build-system sme9]$ nano e-smith-backup.spec

* increase the release version at the beginning of the spec file

Line 155: Line 155:

* update the changelog section, including the release version and bug number

%changelog

−

* Mon Apr 1 2013 ~~xyz~~ burnat <devlist@burnat.com> 2.4.0-4.sme

* Mon Apr 1 2013 chris burnat <devlist@burnat.com> 2.4.0-4.sme

- NFS syntax is deprecated for CIFS mount [SME: 7525]

Line 162: Line 162:

* Check changes against CVS

−

[~~xyz~~@~~buildxxxx~~ sme9]$ cvs diff -u e-smith-backup.spec

[chris@build-system sme9]$ cvs diff -u e-smith-backup.spec

* Build the test RPM

−

[~~xyz~~@~~buildxxxx~~ sme9]$ pwd

[chris@build-system sme9]$ pwd

−

/home/~~xyz~~/work/e-smith-backup/sme9

/home/chris/work/e-smith-backup/sme9

−

[~~xyz~~@~~buildxxxx~~ sme9]$ make mockbuild

[chris@build-system sme9]$ make mockbuild

{{Note box|msg=Mock will determine which configuration to use, but you can specify it if wanting to build for a different architecture for instance.

* IF 32 BITS SYSTEM:

BUILDARCH=i386 make mockbuild

* IF 64 BITS SYSTEM:

BUILDARCH=x86_64 make mockbuild}}

* Check built packages:

−

[~~xyz~~@~~buildxxxx~~ sme9]$ ls -la e-smith-backup-2_4_0-4_el6_sme

[chris@build-system sme9]$ ls -la e-smith-backup-2_4_0-4_el6_sme

* Send new package and patch to workstation for testing/processing:

−

[~~xyz~~@~~buildxxxx~~ sme9]$ scp -P 22 e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch ~~xyz~~\@192.168.xx.1:/home/~~xyz~~/WIP

[chris@build-system sme9]$ scp -P 22 e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch chris\@192.168.xx.1:/home/chris/WIP

−

[~~xyz~~@~~buildxxxx~~ e-smith-qmail-2_4_0-3_el6_sme]$ scp -P 22 e-smith-qmail-2.4.0-3.el6.sme.noarch.rpm ~~xyz~~\@192.168.xx.1:/home/~~xyz~~/WIP

[chris@build-system e-smith-qmail-2_4_0-3_el6_sme]$ scp -P 22 e-smith-qmail-2.4.0-3.el6.sme.noarch.rpm chris\@192.168.xx.1:/home/chris/WIP

* Add the patch file to cvs:

−

[~~xyz~~@~~buildxxxx~~ sme9]$ cvs add e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch

[chris@build-system sme9]$ cvs add e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch

cvs add: scheduling file `e-smith-backup-2.4.0-migrate_to_UNC_syntax.patch' for addition

cvs add: use 'cvs commit' to add this file permanently

Line 187: Line 193:

* Finalise:

−

[~~xyz~~@~~buildxxxx~~ sme9]$ make commit tag build

[chris@build-system sme9]$ make commit tag build

Note: this can also be done in stages:

Line 201: Line 207:

===USE PREP TO CHECK PATCH===

−

{{~~note~~ box|~~please xyz can you summary what you are meaning}}~~

{{Tip box|Often when using a SME8 patch on SME9 it fails due to a minor issue, eg linenumbers, then '''make prep''' tells you that quicker than '''make mockbuild''' and also it shows the problem in the shell rather than having to find the log file.}}

−

However both work.

−

~~[15:51:38] Ian Wells: Hopefully the patch applies cleanly to SME9~~

−

~~[15:51:57] Ian Wells: I find that it is good to do a 'make prep' and see if the patch is OK~~

−

~~[15:51:58] xyz burnat: Am doing local build now, let see~~

−

~~[15:52:04] Ian Wells: Then do a make mockbuild~~

−

~~[15:52:45] xyz burnat: ahhhh Too late, I started the local build, can I do make prep after to check?~~

−

~~[15:53:13] Ian Wells: If the local build works then no worry~~

−

~~[15:53:32] xyz burnat: OK, so either do a make prep or do a local build, yes?~~

−

~~[15:53:40] Ian Wells: Yes~~

−

~~[15:54:11] Ian Wells:~~ Often when using a SME8 patch on SME9 it fails due to a minor issue, eg linenumbers

−

~~[15:54:46] Ian Wells:~~ make prep tells you that quicker than make mockbuild and also it shows the problem in the shell rather than having to find the log file

−

~~[15:54:55] Ian Wells:~~ However both work.

===BUILDING A PACKAGE FROM CVS ON REQUEST===

Line 241: Line 236:

====Example====

−

[~~xyz~~@~~buildxxxx~~ ~]$ cd work/

[chris@build-system ~]$ cd work/

−

[~~xyz~~@~~buildxxxx~~ work]$ cvs -z3 -d:ext:~~smeserver~~.~~cvs~~.~~sourceforge.net~~:/~~cvsroot~~/smeserver co -P e-smith-radiusd

[chris@build-system work]$ cvs -z3 -d:ext:shell.koozali.org:/cvs/smeserver co -P e-smith-radiusd

cvs checkout: Updating e-smith-radiusd

cvs checkout: Updating e-smith-radiusd/sme7

Line 277: Line 274:

U common/tobuild

−

[~~xyz~~@~~buildxxxx~~ sme9]$ cvs update -dPA

[chris@build-system sme9]$ cvs update -dPA

cvs update: Updating .

−

[~~xyz~~@~~buildxxxx~~ sme9]$ cat e-smith-radiusd.spec

[chris@build-system sme9]$ cat e-smith-radiusd.spec

# $Id: e-smith-radiusd.spec,v 1.10 2013/04/14 16:31:14 charliebrady Exp $

Line 321: Line 318:

−

[~~xyz~~@~~buildxxxx~~ sme9]$ make tag

[chris@build-system sme9]$ make tag

cvs tag -c e-smith-radiusd-2_4_0-8_el6_sme

cvs tag: Tagging .

Line 336: Line 333:

Tagged with: e-smith-radiusd-2_4_0-8_el6_sme

−

[~~xyz~~@~~buildxxxx~~ sme9]$ make build

[chris@build-system sme9]$ make build

/usr/bin/plague-client build e-smith-radiusd e-smith-radiusd-2_4_0-8_el6_sme sme9

Package e-smith-radiusd enqueued. Job ID: 3026.

Line 354: Line 351:

* Check package on BUILDSYS

−

~~xyz~~@canxxx:~$ ssh -l xxxxxx shell.contribs.org

chris@canxxx:~$ ssh -l xxxxxx shell.contribs.org

Last login: Wed Apr 10 16:10:50 2013 from mail.burnat.xxx

ll /teams/smeserver/9/test

−

===ADDING SUPPLIED PATCH TO PACKAGE OR PORTING FROM ONE VERSION TO ANOTHER===

Line 369: Line 365:

If looking good then commit to CVS and push to main buildserver

−

~~Ian Wells:~~ If only a patch is provided then the spec file needs to be updated, the patch added to CVS, [I find that it is good to do a 'make prep' and see if the patch is OK]then make the package locally, does it build and does it appear to work, then 'make commit tag build'.

If only a patch is provided then the spec file needs to be updated, the patch added to CVS, [I find that it is good to do a 'make prep' and see if the patch is OK]then make the package locally, does it build and does it appear to work, then:

make commit tag build

You don't need to create a patch as the ones in the bug are correct unified patches, they just need to be save to some relevant name.

Then modify the spec file: update the release number, add a PatchXX line, add a changelog entry, add a %patch line

Nothing needs to be committed to CVS - all this happens locally to you at this point

−

Then ~~make mockbuild~~

Then :

−

make mockbuild

−

~~Q:then I can build locally and test, correct?~~ ~~No need to make the changes in direstories ect, the patch provided by Dani will do the deed?~~

−

~~Yes if your 'test RPM' from~~ make mockbuild ~~looks OK, then you do cvs add XYZ.patch and then make commit tag build~~

−

~~Ian Wells: Just as usual~~

====Bug 7541====

Line 390: Line 384:

smeserver-qpsmtpd reads MaxMessageSize prop of spamassassin and adds it to the arguments of the plugin if defined.

−

[~~xyz~~@~~buildxxxx~~ work]$ pwd

[chris@build-system work]$ pwd

−

/home/~~xyz~~/work

/home/chris/work

−

[~~xyz~~@~~buildxxxx~~ work]$ ls -la

[chris@build-system work]$ ls -la

total 16

−

drwxrwxr-x 4 ~~xyz xyz~~ 4096 Apr 23 13:15 .

drwxrwxr-x 4 chris chris 4096 Apr 23 13:15 .

−

drwx------ 8 ~~xyz xyz~~ 4096 Apr 3 17:01 ..

drwx------ 8 chris chris 4096 Apr 3 17:01 ..

−

drwxrwxr-x 7 ~~xyz xyz~~ 4096 Apr 23 13:15 qpsmtpd

drwxrwxr-x 7 chris chris 4096 Apr 23 13:15 qpsmtpd

−

drwxrwxr-x 7 ~~xyz xyz~~ 4096 Apr 23 13:15 smeserver-qpsmtpd

drwxrwxr-x 7 chris chris 4096 Apr 23 13:15 smeserver-qpsmtpd

*Get package from CVS

−

[~~xyz~~@~~buildxxxx~~ work]$ cvs -z3 -d:ext:~~smeserver~~.~~cvs~~.~~sourceforge.net~~:/~~cvsroot~~/smeserver co -P qpsmtpd

[chris@build-system work]$ cvs -z3 -d:ext:shell.koozali.org:/cvs/smeserver co -P qpsmtpd

−

[~~xyz~~@~~buildxxxx~~ work]$ cvs -z3 -d:ext:~~smeserver~~.~~cvs~~.~~sourceforge.net~~:/~~cvsroot~~/smeserver co -P smeserver-qpsmtpd

[chris@build-system work]$ cvs -z3 -d:ext:shell.koozali.org:/cvs/smeserver co -P smeserver-qpsmtpd

−

[~~xyz~~@~~buildxxxx~~ work]$ ls

[chris@build-system work]$ ls

qpsmtpd smeserver-qpsmtpd

* SAVE PATCHES ON WORKSTATION AND COPY TO LOCAL BUILD SERVER

−

~~xyz~~@caxxxx:~/exchange$ ls -la

chris@caxxxx:~/exchange$ ls -la

−

-rw-rw-r-- 1 ~~xyz xyz~~ 610 2013-04-23 13:29 qpsmtpd-0.84-spamassassin_size_limit.patch

-rw-rw-r-- 1 chris chris 610 2013-04-23 13:29 qpsmtpd-0.84-spamassassin_size_limit.patch

−

-rw-rw-r-- 1 ~~xyz xyz~~ 811 2013-04-23 13:30 smeserver-qpsmtpd-2.2.0-spamassassin_size_limit.patch

-rw-rw-r-- 1 chris chris 811 2013-04-23 13:30 smeserver-qpsmtpd-2.2.0-spamassassin_size_limit.patch

−

~~xyz~~@~~canoxxxx~~:~/exchange$ scp -P 22 qpsmtpd-0.84-spamassassin_size_limit.patch ~~xyz~~\@192.168.0.12:/home/~~xyz~~/exchange

chris@ubuntu-desktopx:~/exchange$ scp -P 22 qpsmtpd-0.84-spamassassin_size_limit.patch chris\@192.168.0.12:/home/chris/exchange

−

~~xyz~~@canxxxx:~/exchange$ scp -P 22 smeserver-qpsmtpd-2.2.0-spamassassin_size_limit.patch ~~xyz~~\@192.168.0.12:/home/~~xyz~~/exchange

chris@canxxxx:~/exchange$ scp -P 22 smeserver-qpsmtpd-2.2.0-spamassassin_size_limit.patch chris\@192.168.0.12:/home/chris/exchange

* OR COPY PATCH FROM SOURCE (sme8)

−

cp e-smith-proxy-5.2.0-squid_additionnal_SSLports.patch /home/~~xyz~~/work/e-smith-proxy/sme9/e-smith-proxy-5.4.0-squid_additionnal_SSLports.patch

cp e-smith-proxy-5.2.0-squid_additionnal_SSLports.patch /home/chris/work/e-smith-proxy/sme9/e-smith-proxy-5.4.0-squid_additionnal_SSLports.patch

* Process qpsmtpd on local BUILD

−

[~~xyz~~@~~buildxxxx~~ work]$ cd qpsmtpd/

[chris@build-system work]$ cd qpsmtpd/

−

[~~xyz~~@~~buildxxxx~~ qpsmtpd]$ ls

[chris@build-system qpsmtpd]$ ls

common CVS sme7 sme8 sme9

−

[~~xyz~~@~~buildxxxx~~ qpsmtpd]$ cvs update -dPA

[chris@build-system qpsmtpd]$ cvs update -dPA

last patch:

0038-Patch-FATAL-PLUGIN-ERROR-check_basicheaders.patch

−

[~~xyz~~@~~buildxxxx~~ sme8]$ pwd

[chris@build-system sme8]$ pwd

−

/home/~~xyz~~/work/qpsmtpd/sme8

/home/chris/work/qpsmtpd/sme8

−

[~~xyz~~@~~buildxxxx~~ sme8]$ pushd ~/exchange/

[chris@build-system sme8]$ pushd ~/exchange/

~/exchange ~/work/qpsmtpd/sme8

−

[~~xyz~~@~~buildxxxx~~ exchange]$ ls

[chris@build-system exchange]$ ls

qpsmtpd-0.84-spamassassin_size_limit.patch

smeserver-qpsmtpd-2.2.0-spamassassin_size_limit.patch

−

[~~xyz~~@~~buildxxxx~~ exchange]$ cp qpsmtpd-0.84-spamassassin_size_limit.patch /home/~~xyz~~/work/qpsmtpd/sme8/0039-qpsmtpd-0.84-spamassassin_size_limit.patch

[chris@build-system exchange]$ cp qpsmtpd-0.84-spamassassin_size_limit.patch /home/chris/work/qpsmtpd/sme8/0039-qpsmtpd-0.84-spamassassin_size_limit.patch

−

[~~xyz~~@~~buildxxxx~~ exchange]$ popd

[chris@build-system exchange]$ popd

~/work/qpsmtpd/sme8

* Check patch:

−

~~Ian Wells: Yes, if~~ you ~~do that it is good to~~ try a 'make prep' that will tell you if the patch from sme8 applied cleanly to sme9. It's quicker than a full build

you should try a 'make prep' that will tell you if the patch from sme8 applied cleanly to sme9. It's quicker than a full build

* Modify the spec file: update the release number, add a PatchXX line, add a changelog entry, add a %patch line

−

[~~xyz~~@~~buildxxxx~~ sme8]$ nano qpsmtpd.spec

[chris@build-system sme8]$ nano qpsmtpd.spec

Version: 0.84 [same]

Release: 4%{?dist}

Line 451: Line 445:

[Fixed in qpsmtpd]

%changelog

−

* Tue Apr 23 2013 ~~xyz~~ burnat <devlist@burnat.com> 0.84-4.sme

* Tue Apr 23 2013 chris burnat <devlist@burnat.com> 0.84-4.sme

- qpsmtpd allows the spamassassin plugin to read the size limit

from its arguments, patch by Daniel [SME: 7541]

Line 461: Line 455:

* Check changes against CVS

−

[~~xyz~~@~~buildxxxx~~ sme8]$ cvs diff -u qpsmtpd.spec

[chris@build-system sme8]$ cvs diff -u qpsmtpd.spec

Index: qpsmtpd.spec

−

RCS file: /~~cvsroot~~/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v

RCS file: /cvs/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v

retrieving revision 1.31

diff -r1.31 qpsmtpd.spec

Line 475: Line 469:

> %patch39 -p1

234a237,240

−

> * Tue Apr 23 2013 ~~xyz~~ burnat <devlist@burnat.com> 0.84-4.sme

> * Tue Apr 23 2013 chris burnat <devlist@burnat.com> 0.84-4.sme

> - qpsmtpd allows the spamassassin plugin to read the size limit

−

> from its arguments, patch by Daniel [SME: 7541

> from its arguments, patch by Daniel [SME: 7541]

* Build locally:

−

[~~xyz~~@~~buildxxxx~~ sme8]$ BUILDARCH=i386 make mockbuild

[chris@build-system sme8]$ BUILDARCH=i386 make mockbuild

−

INFO: Done(/home/~~xyz~~/work/qpsmtpd/sme8/qpsmtpd-0.84-4.el5.sme.src.rpm) Config(smeserver-8-i386-base) 2 minutes 52 seconds

INFO: Done(/home/chris/work/qpsmtpd/sme8/qpsmtpd-0.84-4.el5.sme.src.rpm) Config(smeserver-8-i386-base) 2 minutes 52 seconds

−

INFO: Results and/or logs in: /home/~~xyz~~/work/qpsmtpd/sme8/qpsmtpd-0_84-4_el5_sme

INFO: Results and/or logs in: /home/chris/work/qpsmtpd/sme8/qpsmtpd-0_84-4_el5_sme

INFO: Cleaning up build root ('clean_on_success=True')

Start: lock buildroot

Line 493: Line 487:

* Check packages

−

[~~xyz~~@~~buildxxxx~~ qpsmtpd-0_84-4_el5_sme]$ ls -lah

[chris@build-system qpsmtpd-0_84-4_el5_sme]$ ls -lah

total 1.2M

−

drwxrwxr-x 2 ~~xyz xyz~~ 4.0K Apr 23 14:44 .

drwxrwxr-x 2 chris chris 4.0K Apr 23 14:44 .

−

drwxrwxr-x 4 ~~xyz xyz~~ 4.0K Apr 23 14:41 ..

drwxrwxr-x 4 chris chris 4.0K Apr 23 14:41 ..

-rw-rw-r-- 1 root root 616K Apr 23 14:43 available_pkgs

−

-rw-rw-r-- 1 ~~xyz xyz~~ 27K Apr 23 14:44 build.log

-rw-rw-r-- 1 chris chris 27K Apr 23 14:44 build.log

−

-rw-rw-r-- 1 ~~xyz~~ mock 11K Apr 23 14:44 installed_pkgs

-rw-rw-r-- 1 chris mock 11K Apr 23 14:44 installed_pkgs

−

-rw-rw-r-- 1 ~~xyz~~ mock 187K Apr 23 14:44 qpsmtpd-0.84-4.el5.sme.noarch.rpm

-rw-rw-r-- 1 chris mock 187K Apr 23 14:44 qpsmtpd-0.84-4.el5.sme.noarch.rpm

−

-rw-rw-r-- 1 ~~xyz~~ mock 236K Apr 23 14:44 qpsmtpd-0.84-4.el5.sme.src.rpm

-rw-rw-r-- 1 chris mock 236K Apr 23 14:44 qpsmtpd-0.84-4.el5.sme.src.rpm

−

-rw-rw-r-- 1 ~~xyz~~ mock 16K Apr 23 14:44 qpsmtpd-apache-0.84-4.el5.sme.noarch.rpm

-rw-rw-r-- 1 chris mock 16K Apr 23 14:44 qpsmtpd-apache-0.84-4.el5.sme.noarch.rpm

−

-rw-rw-r-- 1 ~~xyz~~ mock 33K Apr 23 14:44 qpsmtpd-async-0.84-4.el5.sme.noarch.rpm

-rw-rw-r-- 1 chris mock 33K Apr 23 14:44 qpsmtpd-async-0.84-4.el5.sme.noarch.rpm

−

-rw-rw-r-- 1 ~~xyz xyz~~ 67K Apr 23 14:44 root.log

-rw-rw-r-- 1 chris chris 67K Apr 23 14:44 root.log

−

-rw-rw-r-- 1 ~~xyz xyz~~ 2.1K Apr 23 14:44 state.log

-rw-rw-r-- 1 chris chris 2.1K Apr 23 14:44 state.log

* Copy new packages to local folder:

Line 511: Line 505:

* Send new package and patch to workstation for testing/processing:

−

[~~xyz~~@~~buildxxxx~~ exchange]$ scp -P 22 qpsmtpd-0.84-4.el5.sme.noarch.rpm ~~xyz~~\@192.168.0.1:/home/~~xyz~~/WIP

[chris@build-system exchange]$ scp -P 22 qpsmtpd-0.84-4.el5.sme.noarch.rpm chris\@192.168.0.1:/home/chris/WIP

−

[~~xyz~~@~~buildxxxx~~ exchange]$ scp -P 22 qpsmtpd-apache-0.84-4.el5.sme.noarch.rpm ~~xyz~~\@192.168.0.1:/home/~~xyz~~/WIP

[chris@build-system exchange]$ scp -P 22 qpsmtpd-apache-0.84-4.el5.sme.noarch.rpm chris\@192.168.0.1:/home/chris/WIP

−

[~~xyz~~@~~buildxxxx~~ exchange]$ scp -P 22 qpsmtpd-async-0.84-4.el5.sme.noarch.rpm ~~xyz~~\@192.168.0.1:/home/~~xyz~~/WIP

[chris@build-system exchange]$ scp -P 22 qpsmtpd-async-0.84-4.el5.sme.noarch.rpm chris\@192.168.0.1:/home/chris/WIP

* Move to workstation and copy packages to sme8 test-server (32 bits):

Line 537: Line 531:

Subject: Re: Fwd: Updates available for test80

Date: Tue, 23 Apr 2013 15:21:57 +1000

−

From: ~~xyz~~ burnat <cbxxxx@bxxxx.com>

From: chris burnat <cbxxxx@bxxxx.com>

Reply-To: cbxxxx@bxxxx.com

To: root <admin@schxxxxx.com>

Line 559: Line 553:

* OK, we can push this package.

−

[cvs add ~~XYZ~~.patch and then make commit tag build]

[cvs add chris.patch and then make commit tag build]

NOTE: Multiple patches:

−

Ian Wells: yes you will need to 'cvs add ~~XYZ~~.patch' for all the patches, you can actually do cvs add *.patch and it will work it out

Ian Wells: yes you will need to 'cvs add chris.patch' for all the patches, you can actually do cvs add *.patch and it will work it out

−

[~~xyz~~@~~buildxxxx~~ sme8]$ cvs add 0039-qpsmtpd-0.84-spamassassin_size_limit.patch

[chris@build-system sme8]$ cvs add 0039-qpsmtpd-0.84-spamassassin_size_limit.patch

cvs add: scheduling file `0039-qpsmtpd-0.84-spamassassin_size_limit.patch' for addition

cvs add: use 'cvs commit' to add this file permanently

−

[~~xyz~~@~~buildxxxx~~ sme8]$ make commit tag build

[chris@build-system sme8]$ make commit tag build

[snip]

/usr/bin/plague-client build qpsmtpd qpsmtpd-0_84-4_el5_sme sme8

Line 582: Line 576:

Subject: rpms/qpsmtpd/sme8 0039-qpsmtpd-0.84-spamassassin_size_limit.patch, NONE, 1.1 qpsmtpd.spec, 1.31, 1.32

Date: Tue, 23 Apr 2013 05:30:08 +0000

−

From: xxxxxxx <xxxxx@users.~~sourceforge~~.~~net~~>

From: xxxxxxx <xxxxx@users.shell.shell.koozali.org>

−

To: smeserver-cvscommits@lists.~~sourceforge~~.~~net~~

To: smeserver-cvscommits@lists.shell.shell.koozali.org

[ok]

====Bug 7060====

Bug 7060 - Post-upgrades not fired after restore from console

e-smith-base for SME8

About line 131 of /usr/lib/perl5/site_perl/esmith/console/perform_restore.pm

Add the one line given in the original error report.

Create a patch, check it builds, and commit it to CVS

A patch to fire the post-upgrade event just after the restore process:

--- /usr/lib/perl5/site_perl/esmith/console/perform_restore.pm.ori 2012-07-31 16:55:40.000000000 +0200

+++ /usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2012-07-31 16:56:15.000000000 +0200

@@ -129,6 +129,7 @@

system("/etc/init.d/haldaemon", "stop");

system("/etc/init.d/messagebus", "stop");

rmdir("/mnt/bootstrap-console-backup");

+ system("/sbin/e-smith/signal-event", "post-upgrade")

}

#use esmith::console;

----------------------------------------------------------------------

[xxx@xxxx work]$ pwd

/home/chris/work

[chris@bui work]$ cvs -z3 -d:pserver:anonymous@shell.koozali.org:/cvs/smeserver checkout -P e-smith-base

[chris@build-system work]$ cd e-smith-base/sme8/

[chris@build-system sme8]$ cvs update -dPA

[chris@build-system sme8]$ make clean

[chris@build-system sme8]$ make prep

[chris@build-system sme8]$ cp -R e-smith-base-5.2.0 e-smith-base-5.2.0.old

[chris@build-system root]$ ll usr/lib/perl5/site_perl/esmith/console/

total 104

-rw-r--r-- 1 chris chris 1761 Jan 27 2007 backup_running.pm

-rw-r--r-- 1 chris chris 65997 Feb 6 08:08 configure.pm

-rw-r--r-- 1 chris chris

#use esmith::console;

6682 Feb 6 08:08 perform_backup.pm

-rw-r--r-- 1 chris chris 4133 Feb 6 08:08 perform_restore.pm

-rw-r--r-- 1 chris chris 1037 Mar 27 2008 quitConsole.pm

-rw-r--r-- 1 chris chris 862 Mar 27 2008 save_config.pm

-rw-r--r-- 1 chris chris 4867 Aug 21 2008 system_password.pm

[chris@build-system root]$ nano usr/lib/perl5/site_perl/esmith/console/perform_restore.pm

* Original

system("/etc/init.d/haldaemon", "stop");

system("/etc/init.d/messagebus", "stop");

rmdir("/mnt/bootstrap-console-backup"); <<<----line 131

}

# use esmith::console;

* Modified

system("/etc/init.d/haldaemon", "stop");

system("/etc/init.d/messagebus", "stop");

rmdir("/mnt/bootstrap-console-backup");

system("/sbin/e-smith/signal-event", "post-upgrade") <<<line 132

}

#use esmith::console;

[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@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

--- 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/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2013-02-06 08:35:24.527637260 +1100

@@ -129,6 +129,7 @@

system("/etc/init.d/haldaemon", "stop");

system("/etc/init.d/messagebus", "stop");

rmdir("/mnt/bootstrap-console-backup");

+ system("/sbin/e-smith/signal-event", "post-upgrade")

}

#use esmith::console;

[chris@build-system sme8]$ nano e-smith-base.spec

[chris@build-system sme8]$ cvs diff e-smith-base.spec

Index: e-smith-base.spec

===================================================================

RCS file: /cvs/smeserver/rpms/e-smith-base/sme8/e-smith-base.spec,v

retrieving revision 1.142

diff -r1.142 e-smith-base.spec

7c7

< %define release 70

---

> %define release 71

66a67

> Patch55: e-smith-base-5.2.0-fire_post-upgrade_after_restore_process.patch

113a115,117

> * Wed Feb 6 2013 John Crisp <jcrisp@safeandsoundit.co.uk> 5.2.0-71.sme

> - Post-upgrades not fired after restore from console [SME: 7060]

1602a1607

> %patch55 -p1

[chris@build-system sme8]$ make mockbuild

[chris@build-system sme8]$ ll e-smith-base-5_2_0-71_el5_sme

total 852

-rw-rw-r-- 1 chris chris 124407 Feb 6 09:01 build.log

-rw-rw-r-- 1 chris mock 287857 Feb 6 09:01 e-smith-base-5.2.0-71.el5.sme.src.rpm

-rw-rw-r-- 1 chris mock 366908 Feb 6 09:01 e-smith-base-5.2.0-71.el5.sme.x86_64.rpm

-rw-rw-r-- 1 chris mock 52836 Feb 6 09:01 e-smith-base-debuginfo-5.2.0-71.el5.sme.x86_64.rpm

-rw-rw-r-- 1 chris chris 25819 Feb 6 09:01 root.log

-rw-rw-r-- 1 chris chris 1384 Feb 6 09:01 state.log

Now we commit modifications

[chris@build-system sme8]$ cvs update

? e-smith-base-5.2.0

? e-smith-base-5.2.0-71.el5.sme.src.rpm

? e-smith-base-5.2.0-fire_post-upgrade_after_restore_process.patch

? e-smith-base-5_2_0-71_el5_sme

cvs update: Updating .

M e-smith-base.spec

[chris@build-system sme8]$ cvs commit -m 'Bug 7060 - Post-upgrades not fired after restore from console'

cvs commit: Examining .

? e-smith-base-5_2_0-71_el5_sme

? e-smith-base-5.2.0-fire_post-upgrade_after_restore_process.patch

? e-smith-base-5.2.0-71.el5.sme.src.rpm

? e-smith-base-5.2.0

cvs [server aborted]: "commit" requires write access to the repository

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:shell.koozali.org:/cvs/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: /cvs/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===

−

~~15:51:38] … Hopefully the patch applies cleanly to SME9~~

−

~~[15:51:57] Ian Wells: I find that it is good to do a 'make prep' and see if the patch is OK~~

However both work.

−

~~[15:52:04] Ian Wells: Then do a make mockbuild~~

−

~~[15:52:45] xyz burnat: ahhhh Too late, I started the local build, can I do make prep after to check?~~

−

~~[15:53:13] Ian Wells: If the local build works then no worry~~

−

~~[15:53:32] xyz burnat: OK, so either do a make prep or do a local build, yes?~~

−

~~[15:53:40] Ian Wells: Yes~~

−

~~[15:54:11] Ian Wells:~~ Often when using a SME8 patch on SME9 it fails due to a minor issue, eg linenumbers

−

~~[15:54:46] Ian Wells:~~ make prep tells you that quicker than make mockbuild and also it shows the problem in the shell rather than having to find the log file

−

~~[15:54:55] Ian Wells:~~ However both work.

===FIXING ERRORS IN SPEC FILES===

−

~~Last one you will have to teach me is~~ how to fix missing bug reference or spelling errors in spec file of packages already build

how to fix missing bug reference or spelling errors in spec file of packages already build

cvs update -dPA

then edit the .spec file in your favourite editor

cvs commit -m 'your description, eg correct spelling'

−

~~[12:13:40 PM] Ian Wells: Those are in the spec files~~

{{Tip box|You don't build anything, just commit to CVS. The next build will then publish your change. If very important you can force a build, but that needs the version updated and a changelog added to indicate why.}}

−

~~[12:13:52 PM] Ian Wells: So...~~

−

~~[12:14:19 PM] Ian Wells: cvs update -dPA to get the latest for that package~~

−

~~[12:14:33 PM] Ian Wells: then edit the .spec file in your favourite editor~~

−

~~[12:15:08 PM] Ian Wells: then cvs commit -m '' <-- your description, eg correct spelling~~

−

~~[12:15:23 PM] Ian Wells:~~ You don't build anything, just commit to CVS

−

~~[12:15:33 PM] Ian Wells:~~ The next build will then publish your change

−

~~[12:16:29 PM] Ian Wells:~~ If very important you can force a build, but that needs the version updated and a changelog added to indicate why.

−

~~[12:16:52 PM] xyz burnat: Great, I understand. Many thanks, We are getting somewhere on all fronts.~~

EXAMPLE:

−

* Thu Apr 25 2013 ~~xyz~~ burnat <devlist@burnat.com> 0.84.5.sme

* Thu Apr 25 2013 chris burnat <devlist@burnat.com> 0.84.5.sme

- Fix Net::DNS update breaks qpsmtpd, codes suggested by Ian [SME: 7557]

Should be:

−

* Thu Apr 25 2013 ~~xyz~~ burnat <devlist@burnat.com> 0.84.5.sme

* Thu Apr 25 2013 chris burnat <devlist@burnat.com> 0.84.5.sme

- Fix Net::DNS update breaks qpsmtpd, codes suggested by Ian [SME: 7194]

−

[~~xyz~~@~~buildxxxx~~ work]$ pwd

[chris@build-system work]$ pwd

−

/home/~~xyz~~/work

/home/chris/work

−

[~~xyz~~@~~buildxxxx~~ work]$ cvs -z3 -d:ext:~~smeserver.cvs~~.~~sourceforge~~.~~net~~:/~~cvsroot~~/smeserver co -P qpsmtpd

[chris@build-system work]$ cvs -z3 -d:ext:shell.koozali.org:/cvs/smeserver co -P qpsmtpd

* Update

−

[~~xyz~~@~~buildxxxx~~ work]$ cd qpsmtpd/

[chris@build-system work]$ cd qpsmtpd/

−

[~~xyz~~@~~buildxxxx~~ qpsmtpd]$ ls

[chris@build-system qpsmtpd]$ ls

common CVS sme7 sme8 sme9

−

[~~xyz~~@~~buildxxxx~~ qpsmtpd]$ cvs update -dPA

[chris@build-system qpsmtpd]$ cvs update -dPA

cvs update: Updating .

cvs update: Updating common

Line 639: Line 939:

* Update spec file

−

[~~xyz~~@~~buildxxxx~~ sme8]$ nano qpsmtpd.spec

[chris@build-system sme8]$ nano qpsmtpd.spec

%changelog

−

* Thu Apr 25 2013 ~~xyz~~ burnat <devlist@burnat.com> 0.84.5.sme

* Thu Apr 25 2013 chris burnat <devlist@burnat.com> 0.84.5.sme

- Fix Net::DNS update breaks qpsmtpd, codes suggested by Ian [SME: 7194]

* Check changes against CVS

−

[~~xyz~~@~~buildxxxx~~ sme8]$ cvs diff -u qpsmtpd.spec

[chris@build-system sme8]$ cvs diff -u qpsmtpd.spec

Index: qpsmtpd.spec

−

RCS file: /~~cvsroot~~/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v

RCS file: /cvs/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v

retrieving revision 1.33

diff -r1.33 qpsmtpd.spec

Line 657: Line 957:

* Commit

−

[~~xyz~~@~~buildxxxx~~ sme8]$ cvs commit -m 'correct Bug Reference'

[chris@build-system sme8]$ cvs commit -m 'correct Bug Reference'

cvs commit: Examining .

Checking in qpsmtpd.spec;

−

/~~cvsroot~~/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v <-- qpsmtpd.spec

/cvs/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v <-- qpsmtpd.spec

new revision: 1.34; previous revision: 1.33

done

−

Mailing smeserver-cvscommits@lists.~~sourceforge~~.~~net~~...

Mailing smeserver-cvscommits@lists.shell.shell.koozali.org...

Generating notification message...

Generating notification message... done.

Line 672: Line 972:

Subject: rpms/qpsmtpd/sme8 qpsmtpd.spec,1.33,1.34

Date: Thu, 25 Apr 2013 02:16:36 +0000

−

From: xxxxxxxxxxxx <xxxxxx@users.~~sourceforge~~.~~net~~>

From: xxxxxxxxxxxx <xxxxxx@users.shell.shell.koozali.org>

−

To: smeserver-cvscommits@lists.~~sourceforge~~.~~net~~

To: smeserver-cvscommits@lists.shell.shell.koozali.org

−

Update of /~~cvsroot~~/smeserver/rpms/qpsmtpd/sme8

Update of /cvs/smeserver/rpms/qpsmtpd/sme8

−

In directory sfp-cvs-1.v30.ch3.~~sourceforge~~.~~com~~:/tmp/cvs-serv13622

In directory sfp-cvs-1.v30.ch3.shell.shell.koozali.org:/tmp/cvs-serv13622

Modified Files:

Line 685: Line 985:

Index: qpsmtpd.spec

===================================================================

−

RCS file: /~~cvsroot~~/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v

RCS file: /cvs/smeserver/rpms/qpsmtpd/sme8/qpsmtpd.spec,v

retrieving revision 1.33

retrieving revision 1.34

Line 694: Line 994:

%changelog

−

* Thu Apr 25 2013 ~~xyz~~ burnat <devlist@burnat.com> 0.84.5.sme

* Thu Apr 25 2013 chris burnat <devlist@burnat.com> 0.84.5.sme

-- Fix Net::DNS update breaks qpsmtpd, codes suggested by Ian [SME: 7557]

+- Fix Net::DNS update breaks qpsmtpd, codes suggested by Ian [SME: 7194]

−

* Tue Apr 23 2013 ~~xyz~~ burnat <devlist@burnat.com> 0.84-4.sme

* Tue Apr 23 2013 chris burnat <devlist@burnat.com> 0.84-4.sme

−

- qpsmtpd allows the spamassassin plugin to read the size limit

−

===REVERSE CHANGES MADE PREVIOUSLY===

* Edit specfile as usual, except you delete patch references as applicable.

Line 712: Line 1,012:

make commit tag build

−

Note: avoid commenting lines, delete instead if confident...

{{Tip box|Note: avoid commenting lines, delete instead if confident...}}

===PATCHING AN UPSTREAM PACKAGE===

Line 748: Line 1,048:

:* Identical

−

initscripts-centos-branding.patch (content is identical, although files are not)

:* Modified

−

initscripts.spec

−

0002-create-tmp-.X11-unix-in-rc.sysinit.patch (patch is identical but line numbers changed)

:* New

−

initscripts-8.45.44.tar.bz2 (New source will need to be added to buildsys)

−

0001-Fix-comments-in-sysctl.conf.ppc-862597.patch (will be added to CVS)

:* Obsolete

−

initscripts-8.45.42-kpartx.patch (can be removed from CVS)

−

initscripts-8.45.42.tar.bz2

:* Not in upstream SRPM as this is an SME Server patch to be applied each time

−

initscripts-8.45.38-smepatches.patch

Line 812: Line 1,112:

* SEND TO UBUNTU W/S:

−

[~~xyz~~@~~buildxxxx~~ sme8]$ scp -P 22 smeserver-yum-2.2.0-21.el5.sme.src.rpm ~~xyz~~\@192.168.xxx.1:/home/~~xyz~~/WIP

[chris@build-system sme8]$ scp -P 22 smeserver-yum-2.2.0-21.el5.sme.src.rpm chris\@192.168.xxx.1:/home/chris/WIP

The authenticity of host '192.168.xxx.1 (192.168.xxx.1)' can't be established.

RSA key fingerprint is 63:41:79:2b:1f:1f:37:db:80:0d:6e:4d:9b:4a:86:96.

Are you sure you want to continue connecting (yes/no)? yes

Warning: Permanently added '192.168.xxx.1' (RSA) to the list of known hosts.

−

~~xyz~~@192.168.xxx.1's password:

chris@192.168.xxx.1's password:

smeserver-yum-2.2.0-21.el5.sme.src.rpm 100% 85KB 84.7KB/s 00:00

* GET FROM UBUNTU W/S

−

~~xyz~~@canxxxx:~/exchange$ scp -P 22 smeserver-yum-2.2.0-21.el5.sme.src.rpm ~~xyz~~\@192.168.xxx.12:/home/~~xyz~~/exchange

chris@canxxxx:~/exchange$ scp -P 22 smeserver-yum-2.2.0-21.el5.sme.src.rpm chris\@192.168.xxx.12:/home/chris/exchange

−

~~xyz~~@192.168.xxx.12's password:

chris@192.168.xxx.12's password:

smeserver-yum-2.2.0-21.el5.sme.src.rpm 100% 85KB 84.7KB/s 00:00

Line 836: Line 1,136:

following:

−

BUILDARCH=i386 make mockbuild

−

BUILDARCH=x86_64 make mockbuild

This works for everything except for kernel modules on SME <= 8.0. I'll have

to go through my notes for how to build kmods for i686 kernel using i386 config

Line 848: Line 1,148:

=====Perform a Build for sme9 64 bits from an SRPM=====

* Retrieve SRPM from repos:

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ wget http://mirror.canada.pialasse.com/releases/testing/9.0alpha3/smetest/SRPMS/perl-CGI-FormMagick-0.93-2.el6.sme.src.rpm

[chris@build-system SRPMS]$ wget http://mirror.canada.pialasse.com/releases/testing/9.0alpha3/smetest/SRPMS/perl-CGI-FormMagick-0.93-2.el6.sme.src.rpm

* Select chroot environment:

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ CONFIG=smeserver-9-x86_64-base

[chris@build-system SRPMS]$ CONFIG=smeserver-9-x86_64-base

* Build package:

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ mock -r $CONFIG --rebuild ~/rpmbuild/SRPMS/perl-CGI-FormMagick-0.93-2.el6.sme.src.rpm

[chris@build-system SRPMS]$ mock -r $CONFIG --rebuild ~/rpmbuild/SRPMS/perl-CGI-FormMagick-0.93-2.el6.sme.src.rpm

* Check output:

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ ll /var/lib/mock/smeserver-9-x86_64/result

[chris@build-system SRPMS]$ ll /var/lib/mock/smeserver-9-x86_64/result

total 248

−

-rw-rw-r-- 1 ~~xyz~~ mock 14924 Apr 1 08:50 build.log

-rw-rw-r-- 1 chris mock 14924 Apr 1 08:50 build.log

−

-rw-rw-r-- 1 ~~xyz~~ mock 113480 Apr 1 08:50 perl-CGI-FormMagick-0.93-2.el6.sme.noarch.rpm

-rw-rw-r-- 1 chris mock 113480 Apr 1 08:50 perl-CGI-FormMagick-0.93-2.el6.sme.noarch.rpm

−

-rw-rw-r-- 1 ~~xyz~~ mock 90524 Apr 1 08:50 perl-CGI-FormMagick-0.93-2.el6.sme.src.rpm

-rw-rw-r-- 1 chris mock 90524 Apr 1 08:50 perl-CGI-FormMagick-0.93-2.el6.sme.src.rpm

−

-rw-rw-r-- 1 ~~xyz~~ mock 23316 Apr 1 08:50 root.log

-rw-rw-r-- 1 chris mock 23316 Apr 1 08:50 root.log

−

-rw-rw-r-- 1 ~~xyz~~ mock 1224 Apr 1 08:50 state.log

-rw-rw-r-- 1 chris mock 1224 Apr 1 08:50 state.log

=====Perform a Build for sme9 32 bits from an SRPM=====

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ CONFIG=smeserver-9-i386-base

[chris@build-system SRPMS]$ CONFIG=smeserver-9-i386-base

=====Perform a Build for sme8 64 bits from an SRPM=====

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ wget http://mirror.canada.pialasse.com/releases/8.0/smeupdates-testing/SRPMS/perl-CGI-FormMagick-0.92-23.el5.sme.src.rpm

[chris@build-system SRPMS]$ wget http://mirror.canada.pialasse.com/releases/8.0/smeupdates-testing/SRPMS/perl-CGI-FormMagick-0.92-23.el5.sme.src.rpm

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ CONFIG=smeserver-8-x86_64-base

[chris@build-system SRPMS]$ CONFIG=smeserver-8-x86_64-base

=====Perform a Build for sme8 32 bits from an SRPM=====

−

[~~xyz~~@~~buildxxxx~~ SRPMS]$ CONFIG=smeserver-8-i386-base

[chris@build-system SRPMS]$ CONFIG=smeserver-8-i386-base

−

If the build succeeds, it drops your packages into the /var/lib/mock/$CONFIG/result directory. If it fails, you can check mock output, the *.log files above for more info, and/or rerun mock with the -v flag for more verbose messaging. If you get "warning: Could not canonicalize hostname: " it can be ignored. This is a DNS resolution error and the easy solution is to add your hostname to /etc/hosts

* If the build succeeds, it drops your packages into the /var/lib/mock/$CONFIG/result directory.

* If it fails, you can check mock output, the *.log files above for more info, and/or rerun mock with the -v flag for more verbose messaging.

* If you get "warning: Could not canonicalize hostname: " it can be ignored. This is a DNS resolution error and the easy solution is to add your hostname to /etc/hosts

[[category:Developer]]

Trex

Administrators

1,574

edits

Retrieved from "https://wiki.koozali.org/Special:MobileDiff/23608...34129"

Changes

Rpm build example using cvs/mock (view source)

Revision as of 06:27, 18 November 2017

Navigation menu

Search