Skip to contentSkip to conversation

New package: siproxd

PATCH In review Roman I Khimov 7 participants 20 messages Feb 13, 2009 – Apr 21, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 New package: siproxd

Hello all.

packages/siproxd/siproxd.inc new file +9 -0
new file mode 100644
index 0000000..19d002c
@@ -0,0 +1,9 @@
+DESCRIPTION = "SIP proxy/masquerading daemon"
+SECTION = "net"
+DEPENDS = "libosip2"
+RDEPENDS = "libosip2"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/siproxd/siproxd-${PV}.tar.gz"
+
+inherit autotools
packages/siproxd/siproxd_0.7.1.bb new file +3 -0
new file mode 100644
index 0000000..800e3fe
@@ -0,0 +1,3 @@
+require siproxd.inc
+
+PR = "r0"
conf/checksums.ini +4 -0
index ca05e9f..ebf53da 100644
@@ -19686,6 +19686,10 @@ sha256=928fa03d1b8a2329f5e71dd9190080146b5275119e28c19c36fdd57e788d84ba
 md5=597d7ff7edb42a18421c806ffd18a136
 sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 
+[http://downloads.sourceforge.net/siproxd/siproxd-0.7.1.tar.gz]
+md5=45e5a44803181e2bf3361d562060c904
+sha256=9e702c1fe770815ed87cf2a2b1d1d1d87551573d
+
 [http://download.berlios.de/sipsak/sipsak-0.9.6-1.tar.gz]
 md5=c4eb8e282902e75f4f040f09ea9d99d5
 sha256=5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9
#1 lore raw

Review

Quoted 7 lines · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:
(quoted diff) +1 -0
 
+RDEPENDS = "libosip2"
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it) and "r0" is default PR value.

Regards,

Signature · 3 lines
JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
#2 lore raw
Quoted 4 lines · Marcin Juszkiewicz
Quoted 1 line · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:
(quoted diff) +0 -0
Quoted 8 lines

Review

Quoted 5 lines
packages/siproxd/siproxd.inc new file +1 -0
+RDEPENDS = "libosip2"
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it)

Unless it's dlopen()'ed.

regards,

Koen

#3 lore raw
In reply to Marcin Juszkiewicz

Marcin Juszkiewicz:

Quoted 11 lines · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:

Review

Quoted 7 lines
(quoted diff) +1 -0
 
+RDEPENDS = "libosip2"
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it) and "r0" is default PR value.

OK.

conf/checksums.ini +4 -0
index ca05e9f..ebf53da 100644
@@ -19686,6 +19686,10 @@ sha256=928fa03d1b8a2329f5e71dd9190080146b5275119e28c19c36fdd57e788d84ba
 md5=597d7ff7edb42a18421c806ffd18a136
 sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 
+[http://downloads.sourceforge.net/siproxd/siproxd-0.7.1.tar.gz]
+md5=45e5a44803181e2bf3361d562060c904
+sha256=9e702c1fe770815ed87cf2a2b1d1d1d87551573d
+
 [http://download.berlios.de/sipsak/sipsak-0.9.6-1.tar.gz]
 md5=c4eb8e282902e75f4f040f09ea9d99d5
 sha256=5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9
packages/siproxd/siproxd.inc new file +8 -0
new file mode 100644
index 0000000..333210f
@@ -0,0 +1,8 @@
+DESCRIPTION = "SIP proxy/masquerading daemon"
+SECTION = "net"
+DEPENDS = "libosip2"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/siproxd/siproxd-${PV}.tar.gz"
+
+inherit autotools
packages/siproxd/siproxd_0.7.1.bb new file +1 -0
new file mode 100644
index 0000000..760a8b6
@@ -0,0 +1 @@
+require siproxd.inc
#4 lore raw
Quoted 6 lines · Roman I Khimov

Marcin Juszkiewicz:

Quoted 5 lines · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:
Quoted 4 lines
(quoted diff) +1 -0
 
+RDEPENDS = "libosip2"
Quoted 8 lines
Quoted 6 lines

Review

Quoted 3 lines
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it) and "r0" is default PR value.

OK.

It would be quite nice if you could send a git exported patch since it makes the life eaiser for anyone going to apply your commit (locally or for pushing it) and also keeps the credit for you.

If you doesn't know to do that, some guidance can be find at:

http://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html

Cheers,

Signature · 8 lines
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: [email protected]      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
 you the whole house."
#5 lore raw
Quoted 17 lines · Otavio Salvador
Quoted 6 lines · Roman I Khimov

Marcin Juszkiewicz:

Quoted 5 lines · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:
Quoted 4 lines
(quoted diff) +1 -0
 
+RDEPENDS = "libosip2"
Quoted 8 lines
Quoted 6 lines

Review

Quoted 3 lines
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it) and "r0" is default PR value.

OK.

Quoted 7 lines

It would be quite nice if you could send a git exported patch since it makes the life eaiser for anyone going to apply your commit (locally or for pushing it) and also keeps the credit for you.

If you doesn't know to do that, some guidance can be find at:

http://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html

Maybe getting a little OT, but now that we're starting to use patchwork, maybe some comments to GitPhraseBook on how people should be using git format-patch for OE?

Signature · 1 line
Tom Rini
#6 lore raw
Quoted 22 lines · Tom Rini
Quoted 21 lines · Otavio Salvador
Quoted 6 lines · Roman I Khimov

Marcin Juszkiewicz:

Quoted 5 lines · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:
Quoted 4 lines
(quoted diff) +1 -0
 
+RDEPENDS = "libosip2"
Quoted 8 lines
Quoted 6 lines

Review

Quoted 3 lines
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it) and "r0" is default PR value.

OK.

It would be quite nice if you could send a git exported patch since it makes the life eaiser for anyone going to apply your commit (locally or for pushing it) and also keeps the credit for you.

Quoted 7 lines
Quoted 3 lines

If you doesn't know to do that, some guidance can be find at:

http://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html

Maybe getting a little OT, but now that we're starting to use patchwork, maybe some comments to GitPhraseBook on how people should be using git format-patch for OE?

I fear I'm not the best person to do that since I'm far from a good English writer.

Basically we could suggest following workflow for regular users:

- when going to make any change at OE, start a personal branch

$: git checkout -b local master

- HACK; HACK; commit
- once happy with the end result, export the patches to send by mail

$: git format-patch master..

- mail them to ml

   $: git send-email 0001-... --to [email protected]

- go take a beer ;-)

Please someone translate it in something easy to understand :-)

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#7 lore raw

Otavio Salvador:

Quoted 5 lines

Basically we could suggest following workflow for regular users:

- when going to make any change at OE, start a personal branch

$: git checkout -b local master

Here is when the problem starts. Currently we have overlay setup, so I'm extracting everything I'm pushing now from overlay (which itself is managed in git, but that's another story since at least one thing is not managed at all in overlay - checksums).

Quoted 3 lines

$: git format-patch master..

- mail them to ml

And this is another thing I'm not sure about, there might be a lot of 'intermediate' commits leading to nice-upstream-acceptable package, pushing them all in series is kinda wrong, IMHO.

There is of course some git kung fu that might help doing one patch for one thing regardless of the number of intermediate results. But then again there is reviewing process that leads to more changes and more git kung fu to make single patch for single package again.

Does it make any sense? Currently I'm trying to push new things in 'one package - one patch' model, extracting package patch from overlay as git diff some_commit.. plus adding checksums to local OE tree and doing git diff there (not commiting it at all). Then after new package is in, I'm able to pull from main OE and remove things from overlay.

#8 lore raw
Quoted 12 lines · On Monday 16 of February 2009 10:28:26 Roman I Khimov wrote:

Otavio Salvador:

Quoted 3 lines

$: git format-patch master..

- mail them to ml

And this is another thing I'm not sure about, there might be a lot of 'intermediate' commits leading to nice-upstream-acceptable package, pushing them all in series is kinda wrong, IMHO.

then again there is reviewing process that leads to more changes and more git kung fu to make single patch for single package again.

Quoted 6 lines

Does it make any sense? Currently I'm trying to push new things in 'one package - one patch' model, extracting package patch from overlay as git diff some_commit.. plus adding checksums to local OE tree and doing git diff there (not commiting it at all). Then after new package is in, I'm able to pull from main OE and remove things from overlay.

1. Extract those changes as set of git patches.
2. Checkout org.openembedded.dev into temp branch
3. Apply your patches
4. "git rebase -i" and "squash" all changes into one patch
5. Use "git format-patch" and send it to ML
6. Drop temp branch.

Regards,

Signature · 3 lines
JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
#9 lore raw
In reply to Roman I Khimov
Quoted 25 lines · Roman I Khimov

Otavio Salvador:

Quoted 5 lines

Basically we could suggest following workflow for regular users:

- when going to make any change at OE, start a personal branch

$: git checkout -b local master

Here is when the problem starts. Currently we have overlay setup, so I'm extracting everything I'm pushing now from overlay (which itself is managed in git, but that's another story since at least one thing is not managed at all in overlay - checksums).

Quoted 3 lines

$: git format-patch master..

- mail them to ml

And this is another thing I'm not sure about, there might be a lot of 'intermediate' commits leading to nice-upstream-acceptable package, pushing them all in series is kinda wrong, IMHO.

There is of course some git kung fu that might help doing one patch for one thing regardless of the number of intermediate results. But then again there is reviewing process that leads to more changes and more git kung fu to make single patch for single package again.

Quoted 5 lines

Does it make any sense? Currently I'm trying to push new things in 'one package - one patch' model, extracting package patch from overlay as git diff some_commit.. plus adding checksums to local OE tree and doing git diff there (not commiting it at all). Then after new package is in, I'm able to pull from main OE and remove things from overlay.

You need to created another temp branch and cherry-pick the changes to it; after grabbing them you can use:

$: git format-patch master..temp

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#10 lore raw
In reply to Otavio Salvador

Otavio Salvador:

Quoted 14 lines
Quoted 13 lines · Roman I Khimov

Marcin Juszkiewicz:

Quoted 11 lines · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:

Review

Quoted 7 lines
(quoted diff) +1 -0
 
+RDEPENDS = "libosip2"
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it) and "r0" is default PR value.

Quoted 5 lines
Quoted 1 line

OK.

It would be quite nice if you could send a git exported patch since it makes the life eaiser for anyone going to apply your commit (locally or for pushing it) and also keeps the credit for you.

OK, let me try to embed it here first, then I'll try to send raw format-patch output for other patches. I've also fixed config files installation with this one.

From d6e5e440e1083455a916964f2da6695337fcffe6 Mon Sep 17 00:00:00 2001
From: Roman I Khimov <[email protected]>
Date: Mon, 16 Feb 2009 19:03:48 +0300
Subject: [PATCH] siproxd: new package

---
 conf/checksums.ini                |    4 ++++
 packages/siproxd/siproxd.inc      |   17 +++++++++++++++++
 packages/siproxd/siproxd_0.7.1.bb |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 packages/siproxd/siproxd.inc
 create mode 100644 packages/siproxd/siproxd_0.7.1.bb
conf/checksums.ini +4 -0
index e867c6e..e198cae 100644
@@ -19754,6 +19754,10 @@ sha256=928fa03d1b8a2329f5e71dd9190080146b5275119e28c19c36fdd57e788d84ba
 md5=597d7ff7edb42a18421c806ffd18a136
 sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 
+[http://downloads.sourceforge.net/siproxd/siproxd-0.7.1.tar.gz]
+md5=45e5a44803181e2bf3361d562060c904
+sha256=9e702c1fe770815ed87cf2a2b1d1d1d87551573d
+
 [http://download.berlios.de/sipsak/sipsak-0.9.6-1.tar.gz]
 md5=c4eb8e282902e75f4f040f09ea9d99d5
 sha256=5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9
packages/siproxd/siproxd.inc new file +17 -0
new file mode 100644
index 0000000..c4ac144
@@ -0,0 +1,17 @@
+DESCRIPTION = "SIP proxy/masquerading daemon"
+SECTION = "net"
+DEPENDS = "libosip2"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/siproxd/siproxd-${PV}.tar.gz"
+
+do_install_append() {
+	mv ${D}/${sysconfdir}/siproxd.conf{.example,}
+}
+
+CONFFILES_${PN} = " \
+	${sysconfdir}/siproxd.conf \
+	${sysconfdir}/siproxd_passwd.cfg \
+	"
+
+inherit autotools
packages/siproxd/siproxd_0.7.1.bb new file +1 -0
new file mode 100644
index 0000000..760a8b6
@@ -0,0 +1 @@
+require siproxd.inc
Signature · 6 lines
1.6.1.3

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
#11 lore raw
Quoted 82 lines · Roman I Khimov

Otavio Salvador:

Quoted 14 lines
Quoted 13 lines · Roman I Khimov

Marcin Juszkiewicz:

Quoted 11 lines · On Friday 13 of February 2009 22:35:13 Roman I Khimov wrote:

Review

Quoted 7 lines
(quoted diff) +1 -0
 
+RDEPENDS = "libosip2"
(quoted diff) +1 -0
 
+PR = "r0"

Drop those two lines. You should not add libs to RDEPENDS (OE takes care of it) and "r0" is default PR value.

Quoted 5 lines
Quoted 1 line

OK.

It would be quite nice if you could send a git exported patch since it makes the life eaiser for anyone going to apply your commit (locally or for pushing it) and also keeps the credit for you.

OK, let me try to embed it here first, then I'll try to send raw format-patch output for other patches. I've also fixed config files installation with this one.

From d6e5e440e1083455a916964f2da6695337fcffe6 Mon Sep 17 00:00:00 2001
From: Roman I Khimov <[email protected]>
Date: Mon, 16 Feb 2009 19:03:48 +0300
Subject: [PATCH] siproxd: new package

---
 conf/checksums.ini                |    4 ++++
 packages/siproxd/siproxd.inc      |   17 +++++++++++++++++
 packages/siproxd/siproxd_0.7.1.bb |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 packages/siproxd/siproxd.inc
 create mode 100644 packages/siproxd/siproxd_0.7.1.bb
conf/checksums.ini +4 -0
index e867c6e..e198cae 100644
@@ -19754,6 +19754,10 @@ sha256=928fa03d1b8a2329f5e71dd9190080146b5275119e28c19c36fdd57e788d84ba
 md5=597d7ff7edb42a18421c806ffd18a136
 sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 
+[http://downloads.sourceforge.net/siproxd/siproxd-0.7.1.tar.gz]
+md5=45e5a44803181e2bf3361d562060c904
+sha256=9e702c1fe770815ed87cf2a2b1d1d1d87551573d
+
 [http://download.berlios.de/sipsak/sipsak-0.9.6-1.tar.gz]
 md5=c4eb8e282902e75f4f040f09ea9d99d5
 sha256=5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9
packages/siproxd/siproxd.inc new file +17 -0
new file mode 100644
index 0000000..c4ac144
@@ -0,0 +1,17 @@
+DESCRIPTION = "SIP proxy/masquerading daemon"
+SECTION = "net"
+DEPENDS = "libosip2"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/siproxd/siproxd-${PV}.tar.gz"
+
+do_install_append() {
+	mv ${D}/${sysconfdir}/siproxd.conf{.example,}
+}
+
+CONFFILES_${PN} = " \
+	${sysconfdir}/siproxd.conf \
+	${sysconfdir}/siproxd_passwd.cfg \
+	"
+
+inherit autotools
packages/siproxd/siproxd_0.7.1.bb new file +0 -0
new file mode 100644
index 0000000..760a8b6

packages/siproxd/siproxd_0.7.1.bb line 1

Quoted 1 line
packages/siproxd/siproxd_0.7.1.bb new file +1 -0
@@ -0,0 +1 @@
+require siproxd.inc

Thanks for the recipe. I was trying to build it but it failed for me. I gave few rounds and came up with these two patches and added some more stuff to the recipe. Still it would fail while building docs so I gave up. I am using latest dev tree with gcc 4.3.3

The build needs to be fixed before we apply the recipe.

I have attached my stuff here

Thanks

-Khem

#12 lore raw

Khem Raj:

Quoted 6 lines

Thanks for the recipe. I was trying to build it but it failed for me. I gave few rounds and came up with these two patches and added some more stuff to the recipe. Still it would fail while building docs so I gave up. I am using latest dev tree with gcc 4.3.3

The build needs to be fixed before we apply the recipe.

Khem, I've reproduced FTBFS with current OE. I guess it comes from libtool or automake versions mismatch between our distro configuration/version and what's in current -dev for angstrom and minimal.

Will fix and update the patch.

#13 lore raw
In reply to Roman I Khimov
Quoted 1 line · Roman I Khimov

Otavio Salvador:

[...]

[...]

packages/siproxd/siproxd.inc line 10

Quoted 3 lines
packages/siproxd/siproxd.inc new file +3 -0
+do_install_append() {
+	mv ${D}/${sysconfdir}/siproxd.conf{.example,}
+}

[...]

This is bashims, it would be better to use expanded commands instead. Except from it, it looks OK for me.

Mind to fix it?

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#14 lore raw

Otavio Salvador:

Quoted 15 lines
Quoted 1 line · Roman I Khimov

Otavio Salvador:

[...]

[...]

Quoted 3 lines
packages/siproxd/siproxd.inc new file +3 -0
+do_install_append() {
+	mv ${D}/${sysconfdir}/siproxd.conf{.example,}
+}

[...]

Quoted 4 lines

This is bashims, it would be better to use expanded commands instead. Except from it, it looks OK for me.

Mind to fix it?

Sure, I'll fix it this week and will try to push even more things as I'm sitting now on a bunch of patches and have zero time to push anything upstream.

OK. Also, as I've seen Khem had issues trying to build siproxd and even had fixed some of those (original recipe worked fine for me), I've set up two sample testing configs with x86-prescott and qemuarm machines and with plain Angstrom distro. So I've tried to put siproxd in there expecting to reproduce something and discovered another thing - that it wants libosip2 > 3.0.0 while Angstrom has 2.2.2 in preferred.

What's the best way to handle that and specify that siproxd wants libosip2 > 3.0.0? Or it shouldn't be handled in recipes in this cases and I'm just switching to minimal or something and proceeding?

#15 lore raw

Roman I Khimov <[email protected]> writes:

[...]

Quoted 5 lines
Quoted 1 line

Mind to fix it?

Sure, I'll fix it this week and will try to push even more things as I'm sitting now on a bunch of patches and have zero time to push anything upstream.

Nice, thx.

Quoted 10 lines

OK. Also, as I've seen Khem had issues trying to build siproxd and even had fixed some of those (original recipe worked fine for me), I've set up two sample testing configs with x86-prescott and qemuarm machines and with plain Angstrom distro. So I've tried to put siproxd in there expecting to reproduce something and discovered another thing - that it wants libosip2 > 3.0.0 while Angstrom has 2.2.2 in preferred.

What's the best way to handle that and specify that siproxd wants libosip2 > 3.0.0? Or it shouldn't be handled in recipes in this cases and I'm just switching to minimal or something and proceeding?

This is a distro setting, you shouldn't worry about it in your recipe.

If Koen thinks it should be the default, he will handle the preferred version change by himself.

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#16 lore raw
Quoted 20 lines · Otavio Salvador

Roman I Khimov<[email protected]> writes:

[...]

Quoted 5 lines
Quoted 1 line

Mind to fix it?

Sure, I'll fix it this week and will try to push even more things as I'm sitting now on a bunch of patches and have zero time to push anything upstream.

Nice, thx.

Quoted 7 lines

OK. Also, as I've seen Khem had issues trying to build siproxd and even had fixed some of those (original recipe worked fine for me), I've set up two sample testing configs with x86-prescott and qemuarm machines and with plain Angstrom distro. So I've tried to put siproxd in there expecting to reproduce something and discovered another thing - that it wants libosip2> 3.0.0 while Angstrom has 2.2.2 in preferred.

Quoted 8 lines
Quoted 3 lines

What's the best way to handle that and specify that siproxd wants libosip2> 3.0.0? Or it shouldn't be handled in recipes in this cases and I'm just switching to minimal or something and proceeding?

This is a distro setting, you shouldn't worry about it in your recipe.

If Koen thinks it should be the default, he will handle the preferred version change by himself.

Noone seems to know why that's in there and the log message is not being helpfull either, so it's gone now :)

regards,

Koen

#17 lore raw
In reply to Otavio Salvador

Otavio Salvador:

Quoted 1 line

Mind to fix it?

OK, I've fixed that, fixed FTBFS with current autohell thingies (thanks Khem), corrected defconfig a bit, added init script, fixed QA issues (although requiring '.so' to be in -dev is a bit strange to me), fixed packaging in general and I think it is good enough now.

From 962bc0072ab8f5c5b47bb634b596cc3c7ae71d3b Mon Sep 17 00:00:00 2001
From: Roman I Khimov <[email protected]>
Date: Mon, 23 Mar 2009 20:58:14 +0300
Subject: [PATCH] siproxd: new recipe

New recipe for siproxd 0.7.1

---
 conf/checksums.ini                  |    4 ++
 recipes/siproxd/files/no-docs.patch |   38 ++++++++++++++++++++++
 recipes/siproxd/files/siproxd.init  |   59 +++++++++++++++++++++++++++++++++++
 recipes/siproxd/siproxd.inc         |   40 +++++++++++++++++++++++
 recipes/siproxd/siproxd_0.7.1.bb    |    3 ++
 5 files changed, 144 insertions(+), 0 deletions(-)
 create mode 100644 recipes/siproxd/files/no-docs.patch
 create mode 100644 recipes/siproxd/files/siproxd.init
 create mode 100644 recipes/siproxd/siproxd.inc
 create mode 100644 recipes/siproxd/siproxd_0.7.1.bb
conf/checksums.ini +4 -0
index d448c2a..e3115e5 100644
@@ -20918,6 +20918,10 @@ sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 md5=597d7ff7edb42a18421c806ffd18a136
 sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 
+[http://downloads.sourceforge.net/siproxd/siproxd-0.7.1.tar.gz]
+md5=45e5a44803181e2bf3361d562060c904
+sha256=5eef70f4e0a8f0f4628550807da3036f8b3086864bf4bcf5ab6d22ac3a6efd81
+
 [http://download.berlios.de/sipsak/sipsak-0.9.6-1.tar.gz]
 md5=c4eb8e282902e75f4f040f09ea9d99d5
 sha256=5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9
recipes/siproxd/files/no-docs.patch new file +38 -0
new file mode 100644
index 0000000..499a5bb
@@ -0,0 +1,38 @@
+Taken from siproxd snapshot
+
+--- siproxd-0.7.1/configure.in	2008-02-02 20:13:31.000000000 +0300
++++ siproxd-0.7.2/configure.in	2009-03-01 18:41:27.000000000 +0300
+@@ -135,6 +141,33 @@
+ 
+ 
+ dnl **********************************************
++dnl * Building doc
++dnl **********************************************
++
++dnl
++dnl --enable-doc
++dnl
++
++   build_docs="yes";
++   AC_MSG_CHECKING(build documentation)
++   AC_ARG_ENABLE(doc,
++      [  --disable-doc               build pdf/html doc (default=enabled)],
++      if test "x$enableval" = "xno"; then
++         build_docs="no";
++      fi
++      AC_MSG_RESULT($build_docs), AC_MSG_RESULT($build_docs))
++   if test "x$build_docs" = "xyes"; then
++      AC_CHECK_PROG(docbook2pdf,docbook2pdf,yes,)
++      AM_CONDITIONAL(have_docbook2pdf,test "$docbook2pdf" = "yes")
++      AC_CHECK_PROG(docbook2html,docbook2html,yes,)
++      AM_CONDITIONAL(have_docbook2html,test "$docbook2html" = "yes")
++   else
++      AM_CONDITIONAL(have_docbook2pdf,false)
++      AM_CONDITIONAL(have_docbook2html,false)
++   fi
++
++
++dnl **********************************************
+ dnl * Selection of static build variants
+ dnl **********************************************
+ 
recipes/siproxd/files/siproxd.init new file +59 -0

59 lines not on this page · raw message

recipes/siproxd/siproxd.inc new file +40 -0
new file mode 100644
index 0000000..1e7f3ae
@@ -0,0 +1,40 @@
+DESCRIPTION = "SIP proxy/masquerading daemon"
+SECTION = "net"
+DEPENDS = "libosip2"
+LICENSE = "GPL"
+
+SRC_URI = " \
+	${SOURCEFORGE_MIRROR}/siproxd/siproxd-${PV}.tar.gz \
+	file://siproxd.init \
+	"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "siproxd"
+
+EXTRA_OECONF = "--disable-doc"
+
+do_configure() {
+	gnu-configize
+	aclocal
+	libtoolize --copy --force
+	automake --add-missing
+	autoreconf
+	oe_runconf
+}
+
+do_install_append() {
+	cp ${D}/${sysconfdir}/siproxd.conf.example ${D}/${sysconfdir}/siproxd.conf
+	sed -ri "s,^#?(pid_file)\ *=\ *.*$,\1 = /var/run/siproxd.pid," ${D}/${sysconfdir}/siproxd.conf
+	sed -ri "s,^#?(plugindir)\ *=\ *.*$,\1 = ${libdir}/siproxd/," ${D}/${sysconfdir}/siproxd.conf
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/siproxd.init ${D}/${sysconfdir}/init.d/siproxd
+}
+
+CONFFILES_${PN} = " \
+	${sysconfdir}/siproxd.conf \
+	${sysconfdir}/siproxd_passwd.cfg \
+	"
+
+FILES_${PN} = "${sysconfdir} ${sbindir} ${libdir}/siproxd/*.so.*"
+FILES_${PN}-dev += "${libdir}/siproxd/*.so ${libdir}/siproxd/*.a ${libdir}/siproxd/*.la"
recipes/siproxd/siproxd_0.7.1.bb new file +3 -0
new file mode 100644
index 0000000..66c36d1
@@ -0,0 +1,3 @@
+require siproxd.inc
+
+SRC_URI += "file://no-docs.patch;patch=1"
Signature · 1 line
1.6.2.1
#18 lore raw
Quoted 1 line · On Thursday 26 March 2009 17:56:23 Roman I Khimov wrote:

New recipe for siproxd 0.7.1

ping