Re: [CFT] net-im/ejabberd to 16.01

2016-03-15 Thread Marko Cupać 
Hi,

thanks for new port. I've upgraded to 16.02_1 from ports without any
problems:
https://xmpp.net/result.php?domain=mimar.rs=client#general

It took me some time to get used to the fact that I need to stop
ejabberd service, kill epmd process, and restart ejabberd service to
pick up new version. Without killing epmd, ejabberd after upgrade does
not start, but also does not write anything to logs. From my point of
view It would be great if simple 'service ejabberd restart' took care
of restarting corresponding empd process. If this is actually a
terrible idea because of some other implications that don't affect me,
perhaps a line similar to "don't forget to kill epmd process when
upgrading" in pkg-message would be informative.

Regards,
-- 
Before enlightenment - chop wood, draw water.
After  enlightenment - chop wood, draw water.

Marko Cupać
https://www.mimar.rs/
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: [CFT] net-im/ejabberd to 16.02 (was: Re: [CFT] net-im/ejabberd to 16.01)

2016-03-08 Thread Kurt Jaeger 
Hi!

> I have updated my diff to install the file at the expected location. Other
> changes in this update is cleanup, and updation of dependencies tarball.

Please, may I suggest you test the resulting port with

portlint -AC

? There are a few issues, among them the exec/unexec in the pkg-plist,
which nowadays can be cleaned up with @sample.

See:

https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#plist-keywords-sample

For the really tricky patch-.. file, what about using the
EXTRA_PATCHES contruct instead ?

-- 
p...@opsec.eu+49 171 3101372 4 years to go !
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

[CFT] net-im/ejabberd to 16.02 (was: Re: [CFT] net-im/ejabberd to 16.01)

2016-03-08 Thread Ashish SHUKLA 
On Mon, 7 Mar 2016 20:19:46 +0100, Matthieu Volat  said:
| On Mon, 07 Mar 2016 12:27:11 +0530
| ash...@freebsd.org (Ashish SHUKLA) wrote:

|| On Sat, 5 Mar 2016 18:09:35 +0100, Matthieu Volat  said:
|| 
|| [...]
|| 
|| Hi,
|| 
|| | Ok, back on business!
|| 
|| | My issue with the non-applied patchs is that those were not creates in the 
files subdir in ejabberd, but in a ejabberd/files subdir.
|| 
|| That is likely due to the missing/incorrect, use of 'patch -pN'. I remember
|| testing successful diff application before posting on the list, except for a
|| 404-ing URL in one of my diffs.

| Yeah, it was a simple patch -p0 call... But anyway, that won't matter for 
final distribution...

|| 
|| | Regarding the pam module installation, it seems to be installed in :
|| | /usr/local/lib/erlang/lib/ejabberd-16.01/lib/p1_pam-1.0.0/priv/bin/epam
|| 
|| | But ejabberd at start will fail with :
|| | 2016-03-05 17:52:49.297 [error] <0.394.0> Can't open file
|| | 
"/usr/local/lib/erlang/lib/ejabberd-16.01/lib/erlang/lib/ejabberd-16.01/priv/bin/epam":
 enoent
|| 
|| | So I guess it's not installed in the right place?
|| 
|| I guess, although I don't see in the sources, where exactly it refer to this
|| path, or even install the module. I'll check and get back to you.

| I forgot to tell that I did not see it either, but I tried to put it manually 
and pam support was working.

It seems this is mentioned here p1_pam/src/epam.erl at:

142 get_bin_path() ->
143 case os:getenv("EJABBERD_BIN_PATH") of
144 false ->
145 case code:priv_dir(p1_pam) of
146 {error, _} ->
147 filename:join(["priv", "bin"]);
148 Path ->
149 filename:join([Path, "bin"])
150 end;
151 Path ->
152 Path
153 end.

I have updated my diff to install the file at the expected location. Other
changes in this update is cleanup, and updation of dependencies tarball.

Could you (and anyone else) please try the diff and see if it works for you,
and let me know before this March 04, 2016, hopefully no more releases this
time :) ?

https://people.freebsd.org/~ashish/diffs/ejabberd-16.02-0.diff
sha256: 4992e303b2dc7e3ee814d032991cdea7cec8e373f23d94d2e4c9e633b6a245a1

Thanks for your efforts, and time testing this, and providing the
feedback. It's really appreciated.

-- 
Ashish SHUKLA  | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0

“Yeah, sure. Babies learn their mother tongue by reading the great
philosophers…“ (Pascal Bourguignon, comp.lang.lisp)

Sent from my Emacs


signature.asc
Description: PGP signature

Re: [CFT] net-im/ejabberd to 16.01

2016-03-07 Thread Matthieu Volat 
On Mon, 07 Mar 2016 12:27:11 +0530
ash...@freebsd.org (Ashish SHUKLA) wrote:

> On Sat, 5 Mar 2016 18:09:35 +0100, Matthieu Volat  said:
> 
> [...]
> 
> Hi,
> 
> | Ok, back on business!
> 
> | My issue with the non-applied patchs is that those were not creates in the 
> files subdir in ejabberd, but in a ejabberd/files subdir.
> 
> That is likely due to the missing/incorrect, use of 'patch -pN'. I remember
> testing successful diff application before posting on the list, except for a
> 404-ing URL in one of my diffs.

Yeah, it was a simple patch -p0 call... But anyway, that won't matter for final 
distribution...

> 
> | Regarding the pam module installation, it seems to be installed in :
> | /usr/local/lib/erlang/lib/ejabberd-16.01/lib/p1_pam-1.0.0/priv/bin/epam
> 
> | But ejabberd at start will fail with :
> | 2016-03-05 17:52:49.297 [error] <0.394.0> Can't open file
> | 
> "/usr/local/lib/erlang/lib/ejabberd-16.01/lib/erlang/lib/ejabberd-16.01/priv/bin/epam":
>  enoent
> 
> | So I guess it's not installed in the right place?
> 
> I guess, although I don't see in the sources, where exactly it refer to this
> path, or even install the module. I'll check and get back to you.

I forgot to tell that I did not see it either, but I tried to put it manually 
and pam support was working.

> 
> | Then, regarding the bash issue, I made some progress, but I still need
> | to test it a bit more to be sure it do not introduce new bugs (it's
> | not much, but I have to see if the kinda simple shell escaping
> | function equivalent I put is enough).
> 
> These bash script changes could you contribute to upstream instead. I don't
> really wish to keep maintaining them downstream.

I agree.

> 
> ejabberd team has released 16.02 in the meantime, I'll work on updating to it
> instead. It works fine in my testing so far except for the PAM issue you've
> mentioned.
> 
> I'll post updated patch here for testing.
> 
> Thanks!
> -- 
> Ashish SHUKLA  | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
> 
> “If I were to compare a human's heart with the ocean, the ocean would be
> stagnant.”   (Recruit, Arakawa Under the Bridge)
> 
> Sent from my Emacs


-- 
Matthieu Volat 
tel: 06 84 54 39 43
www: 


pgpBZzzTB6IWN.pgp
Description: OpenPGP digital signature

Re: [CFT] net-im/ejabberd to 16.01

2016-03-06 Thread Ashish SHUKLA 
On Sat, 5 Mar 2016 18:09:35 +0100, Matthieu Volat  said:

[...]

Hi,

| Ok, back on business!

| My issue with the non-applied patchs is that those were not creates in the 
files subdir in ejabberd, but in a ejabberd/files subdir.

That is likely due to the missing/incorrect, use of 'patch -pN'. I remember
testing successful diff application before posting on the list, except for a
404-ing URL in one of my diffs.

| Regarding the pam module installation, it seems to be installed in :
| /usr/local/lib/erlang/lib/ejabberd-16.01/lib/p1_pam-1.0.0/priv/bin/epam

| But ejabberd at start will fail with :
| 2016-03-05 17:52:49.297 [error] <0.394.0> Can't open file
| 
"/usr/local/lib/erlang/lib/ejabberd-16.01/lib/erlang/lib/ejabberd-16.01/priv/bin/epam":
 enoent

| So I guess it's not installed in the right place?

I guess, although I don't see in the sources, where exactly it refer to this
path, or even install the module. I'll check and get back to you.

| Then, regarding the bash issue, I made some progress, but I still need
| to test it a bit more to be sure it do not introduce new bugs (it's
| not much, but I have to see if the kinda simple shell escaping
| function equivalent I put is enough).

These bash script changes could you contribute to upstream instead. I don't
really wish to keep maintaining them downstream.

ejabberd team has released 16.02 in the meantime, I'll work on updating to it
instead. It works fine in my testing so far except for the PAM issue you've
mentioned.

I'll post updated patch here for testing.

Thanks!
-- 
Ashish SHUKLA  | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0

“If I were to compare a human's heart with the ocean, the ocean would be
stagnant.”   (Recruit, Arakawa Under the Bridge)

Sent from my Emacs


signature.asc
Description: PGP signature

Re: [CFT] net-im/ejabberd to 16.01

2016-03-05 Thread Matthieu Volat 
On Mon, 29 Feb 2016 19:34:09 +0530
ash...@freebsd.org (Ashish SHUKLA) wrote:

> On Mon, 29 Feb 2016 14:37:22 +0100, Matthieu Volat  said:
> 
> 
> [...]
> 
> 
> | Hmm, I'll be a bit overwhelmed until thursday, I'll check that...
> 
> Thanks, and I appreciate it.
> 
> [...]
> 
> | Thanks, there was another blocking issue for me yesterday, which is the 
> ejabberdctl is now in bash.
> 
> | If possible, I'd like to make a patch to (optionally) revert to pure sh, as 
> I find it a bit sad to go full bash only to read a few parameters...
> 
> | I'll keep you informed
> 
> Thanks in advance, if you could provide the patch. For now, I have updated the
> diff to include dependency on bash, which I apparently missed before :/
> 
> New diff:
> 
> https://people.freebsd.org/~ashish/diffs/ejabberd-16.01-01.diff
> sha256 sum: ec71fdd19c752b22271ce6e3f899b966b0017f05fa13532d1decf18478e41b6e
> 

Ok, back on business!

My issue with the non-applied patchs is that those were not creates in the 
files subdir in ejabberd, but in a ejabberd/files subdir.


Regarding the pam module installation, it seems to be installed in :
/usr/local/lib/erlang/lib/ejabberd-16.01/lib/p1_pam-1.0.0/priv/bin/epam

But ejabberd at start will fail with :
2016-03-05 17:52:49.297 [error] <0.394.0> Can't open file
"/usr/local/lib/erlang/lib/ejabberd-16.01/lib/erlang/lib/ejabberd-16.01/priv/bin/epam":
 enoent

So I guess it's not installed in the right place?


Then, regarding the bash issue, I made some progress, but I still need to test 
it a bit more to be sure it do not introduce new bugs (it's not much, but I 
have to see if the kinda simple shell escaping function equivalent I put is 
enough).


-- 
Matthieu Volat 


pgpCwzOQ0hyZ_.pgp
Description: OpenPGP digital signature

Re: [CFT] net-im/ejabberd to 16.01

2016-03-01 Thread Marko Cupać 
On Mon, 29 Feb 2016 19:41:00 +0530
ash...@freebsd.org (Ashish SHUKLA) wrote:

> https://people.freebsd.org/~ashish/diffs/ejabberd-16.01-02.diff
> sha256 sum:
> ec71fdd19c752b22271ce6e3f899b966b0017f05fa13532d1decf18478e41b6e

Hi, Ashish,

I'd be glad to test this, but the patch does not apply cleanly in my
environment. I don't know if it is relevant, but my ports dir is a
symlink:
/usr/ports -> /usr/local/poudriere/ports/default

When patch is applied in /usr/ports/net-im/ejabberd, first few sections
apply OK, then it starts asking paths and applies diffs if correct path
is entered, and finally it exits with:

Patching file pkg-plist using Plan A...
patch:  malformed patch at line 1171:
%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_utils.beam

Regards,
-- 
Before enlightenment - chop wood, draw water.
After  enlightenment - chop wood, draw water.

Marko Cupać
https://www.mimar.rs/
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: [CFT] net-im/ejabberd to 16.01

2016-02-29 Thread Ashish SHUKLA 
On Mon, 29 Feb 2016 19:34:09 +0530, ash...@freebsd.org (Ashish SHUKLA) said:

[...]


| https://people.freebsd.org/~ashish/diffs/ejabberd-16.01-01.diff
| sha256 sum: ec71fdd19c752b22271ce6e3f899b966b0017f05fa13532d1decf18478e41b6e

Sigh!

Sorry, posted the old URL. This should be:

https://people.freebsd.org/~ashish/diffs/ejabberd-16.01-02.diff
sha256 sum: ec71fdd19c752b22271ce6e3f899b966b0017f05fa13532d1decf18478e41b6e

-- 
Ashish SHUKLA

“We are all in the gutter, but some of us are looking at the stars.”
   (Oscar Wilde)

Sent from my Emacs


signature.asc
Description: PGP signature

Re: [CFT] net-im/ejabberd to 16.01

2016-02-29 Thread Ashish SHUKLA 
On Mon, 29 Feb 2016 14:37:22 +0100, Matthieu Volat  said:


[...]


| Hmm, I'll be a bit overwhelmed until thursday, I'll check that...

Thanks, and I appreciate it.

[...]

| Thanks, there was another blocking issue for me yesterday, which is the 
ejabberdctl is now in bash.

| If possible, I'd like to make a patch to (optionally) revert to pure sh, as I 
find it a bit sad to go full bash only to read a few parameters...

| I'll keep you informed

Thanks in advance, if you could provide the patch. For now, I have updated the
diff to include dependency on bash, which I apparently missed before :/

New diff:

https://people.freebsd.org/~ashish/diffs/ejabberd-16.01-01.diff
sha256 sum: ec71fdd19c752b22271ce6e3f899b966b0017f05fa13532d1decf18478e41b6e

Thanks!
-- 
Ashish SHUKLA  | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
Sent from my Emacs


signature.asc
Description: PGP signature

Re: [CFT] net-im/ejabberd to 16.01

2016-02-29 Thread Matthieu Volat 

> Le 29 févr. 2016 à 02:01, Ashish SHUKLA  a écrit :
> 
> On Sun, 28 Feb 2016 19:33:53 +0100, Matthieu Volat  said:
> | On Sun, 28 Feb 2016 21:02:59 +0530
> | ash...@freebsd.org (Ashish SHUKLA) wrote:
> 
> [..]
> 
> | Thanks for your work,
> 
> Thank you for taking time to test the diff.
> 
> | On my 10.2/amd64 host, the build failed due to using  types 
> without including it in :
> 
> |   /usr/ports/net-im/ejabberd/work/deps/p1_stringprep/c_src/stringprep.cpp
> 
> Following changeset from the diff file should fix this:
> 
> --8<---cut here---start->8---
> diff -urN 
> /usr/ports/net-im/ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp
>  ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp
> --- 
> /usr/ports/net-im/ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp
>1970-01-01 05:30:00.0 +0530
> +++ ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp 
> 2016-02-28 20:11:00.521409079 +0530
> @@ -0,0 +1,10 @@
> +--- ../deps/p1_stringprep/c_src/stringprep.cpp.orig
>  ../deps/p1_stringprep/c_src/stringprep.cpp
> +@@ -19,6 +19,7 @@
> +  */
> +
> + #include 
> ++#include 
> + #include 
> +
> + #include "uni_data.c"
> --8<---cut here---end--->8---
> 
> Are you sure, the diff was not properly applied. I tried the diff from the
> URL, and applied on net-im/ejabberd and seems to have applied fine, and it
> builds fine too, on 10.2-RELEASE/amd64

Hmm, I'll be a bit overwhelmed until thursday, I'll check that...

> 
> | And it seems the pam module is not installed, again?
> 
> | chmod: /usr/local/lib/erlang/lib/ejabberd-16.01/priv/bin/epam: No such file 
> or directory
> | chown: /usr/local/lib/erlang/lib/ejabberd-16.01/priv/bin/epam: No such
> | file or directory
> 
> This is an oversight on my part. Sorry about this. I have updated the diff to
> refer to the correct path.
> 
> https://people.freebsd.org/~ashish/diffs/ejabberd-16.01-01.diff
> sha256 sum: 7dd1f02da1ccf035f58d857a710787bdc6080d2e2651ca1dd9d1a335a3cc57c8
> 
> If you could functionally test PAM support as well, that'll be great.

Thanks, there was another blocking issue for me yesterday, which is the 
ejabberdctl is now in bash.

If possible, I'd like to make a patch to (optionally) revert to pure sh, as I 
find it a bit sad to go full bash only to read a few parameters...

I'll keep you informed

> 
> Thanks!
> --
> Ashish SHUKLA  | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
> Sent from my Emacs



signature.asc
Description: Message signed with OpenPGP using GPGMail

Re: [CFT] net-im/ejabberd to 16.01

2016-02-28 Thread Ashish SHUKLA 
On Sun, 28 Feb 2016 19:33:53 +0100, Matthieu Volat  said:
| On Sun, 28 Feb 2016 21:02:59 +0530
| ash...@freebsd.org (Ashish SHUKLA) wrote:

[..]

| Thanks for your work,

Thank you for taking time to test the diff.

| On my 10.2/amd64 host, the build failed due to using  types without 
including it in :

|   /usr/ports/net-im/ejabberd/work/deps/p1_stringprep/c_src/stringprep.cpp

Following changeset from the diff file should fix this:

--8<---cut here---start->8---
diff -urN 
/usr/ports/net-im/ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp
 ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp
--- 
/usr/ports/net-im/ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp
 1970-01-01 05:30:00.0 +0530
+++ ejabberd/files/patch-.._deps_p1__stringprep_c__src_stringprep.cpp   
2016-02-28 20:11:00.521409079 +0530
@@ -0,0 +1,10 @@
+--- ../deps/p1_stringprep/c_src/stringprep.cpp.orig
 ../deps/p1_stringprep/c_src/stringprep.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include 
++#include 
+ #include 
+ 
+ #include "uni_data.c"
--8<---cut here---end--->8---

Are you sure, the diff was not properly applied. I tried the diff from the
URL, and applied on net-im/ejabberd and seems to have applied fine, and it
builds fine too, on 10.2-RELEASE/amd64

| And it seems the pam module is not installed, again?

| chmod: /usr/local/lib/erlang/lib/ejabberd-16.01/priv/bin/epam: No such file 
or directory
| chown: /usr/local/lib/erlang/lib/ejabberd-16.01/priv/bin/epam: No such
| file or directory

This is an oversight on my part. Sorry about this. I have updated the diff to
refer to the correct path.

https://people.freebsd.org/~ashish/diffs/ejabberd-16.01-01.diff
sha256 sum: 7dd1f02da1ccf035f58d857a710787bdc6080d2e2651ca1dd9d1a335a3cc57c8

If you could functionally test PAM support as well, that'll be great.

Thanks!
-- 
Ashish SHUKLA  | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
Sent from my Emacs


signature.asc
Description: PGP signature

Re: [CFT] net-im/ejabberd to 16.01

2016-02-28 Thread Matthieu Volat 
On Sun, 28 Feb 2016 21:02:59 +0530
ash...@freebsd.org (Ashish SHUKLA) wrote:

> Howdy,
> 
> I've prepared a long-time pending update for net-im/ejabberd port. Could you
> please test it, and see if it works for you, or something needs change, or
> need a explicit mention ?
> 
> One thing of note is that in this release, paths are changed a bit, courtesy:
> upstream. So, it may break if you rely on paths or something.
> 
> I plan to commit this update on Friday, March 04, 2016.
> 
> If you could give it a shot, and report any issues, that'll be great.
> 
> Following is the link to update:
> 
> http://people.freebsd.org/~ashish/diffs/ejabberd-16.01.diff
> sha256: 1e95776e60a3e2c9cef055d9b08ee59a99f4a18690ab752b17b73bc545d74f22
> 
> Thanks in advance.
> 
> Have a great week{,end} ahead!
> 
> -- 
> Ashish SHUKLA  | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
> Sent from my Emacs

Thanks for your work,

On my 10.2/amd64 host, the build failed due to using  types without 
including it in :

  /usr/ports/net-im/ejabberd/work/deps/p1_stringprep/c_src/stringprep.cpp

And it seems the pam module is not installed, again?

chmod: /usr/local/lib/erlang/lib/ejabberd-16.01/priv/bin/epam: No such file or 
directory
chown: /usr/local/lib/erlang/lib/ejabberd-16.01/priv/bin/epam: No such
file or directory

-- 
Matthieu Volat 


pgpTUpxdX5fVJ.pgp
Description: OpenPGP digital signature