Re: workflow question: how do you maintain the port in sync with upstream?

2018-08-13 Thread Adam Weinberger 
On Mon, Aug 13, 2018 at 4:28 PM Helen Koike  wrote:
>
> Hello,
>
> I am new to the community, I am maintaining two packages and I would
> like to check with you if there is a better workflow to do this.
>
> The upstream project of the port I am maintaining is held in github, and
> I also have patches in the /usr/ports/sysutils/myport/file/ folder.
>
> So I keep a fork of the upstream project with a branch containing a
> commit with the patches from the /usr/ports/sysutils/myport/file/.
>
> Every time I need to update the port to a newer version, I do a git pull
> in this branch, then I run a script [1] to re-generate the patches in
> the /usr/ports/sysutils/myport/file/
>
> This script basically generates a file.orig of all modified files in
> git, then copy the modified file to WORK_DIR, then run make makepatch.
>
>
> for file in ${CHANGES}; do
> mv ${WORK_DIR}/${file} ${WORK_DIR}/${file}.orig
> cp ${PROJECT_PATH}/${file} ${WORK_DIR}/${file}
> done
> make makepatch
>
>
> I would like to know if there is a better way to do this (some tool that
> I am not aware of?).

IIUC, the process you're describing seems to be rebasing your changes
and then generating diffs. You might have an easier time if you just
do that: rebase, and then generate a diff (see the last point here).

Your script automates some of the routine Makefile changes, and while
there are some tools in ports-mgmt/ that can automate that, we don't
generally recommend them.

It's common for Makefiles to have a maintainer-update: target that
keeps the repetitive update tasks in the Makefile (which also helps
the next person to maintain the port).

Also, where many files are modified on a continually-changing basis,
it's acceptable (though less systemically desirable) to put all your
patches into one file. The benefit is that you can generate that one
file with a single git diff, and it makes PR submission far, far
simpler.

Do any of those help?

# Adam


-- 
Adam Weinberger
ad...@adamw.org
https://www.adamw.org
___
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: has a framework change broken sysutils/google-compute-engine-oslogin?

2018-08-13 Thread Julian Elischer 

On 13/8/18 9:16 pm, Helen Koike wrote:

Hi all,

On 08/08/2018 03:04 PM, Dmitri Goutnik wrote:

On 18-08-09 01:16:51, Julian Elischer wrote:

On 8/8/18 6:30 pm, Jan Beich wrote:

Julian Elischer  writes:


g++ -O2 -pipe -DPANZURA_DEV -DPZ_LONGNAMES -fstack-protector -isystem
/usr/local/include -fno-strict-aliasing -isystem /usr/local/include
-fPIC -c pam_module/pam_oslogin_login.cc -o
pam_module/pam_oslogin_login.o
g++ -fstack-protector -I/usr/local/include/json-c -o
google_authorized_keys authorized_keys/authorized_keys.cc
utils/oslogin_utils.cc -lcurl -ljson-c
g++ -fstack-protector -Wall -Wstrict-prototypes -fPIC -shared
-Wl,-soname,libnss_cache_oslogin.so.2 -o
libnss_cache_google-compute-engine-oslogin-1.3.0.so
libnss_cache_oslogin/nss_cache_oslogin.o
libnss_cache_oslogin/compat/getpwent_r.o
utils/oslogin_utils.cc:16:23: error: curl/curl.h: No such file or
directory
utils/oslogin_utils.cc:16:23: error: curl/curl.h: No such file or
directory

- GCC 4.2.1 (patched) from base system is not a supported configuration
on i386/amd64/aarch64/armv6/armv7
- C*FLAGS aren't consistently respected, see
https://wiki.freebsd.org/WarnerLosh/UsrLocal#Include_paths
https://www.freebsd.org/doc/en/books/porters-handbook/dads-cflags.html

$ g++7 -v -xc++ -
[...]
ignoring nonexistent directory 
"/usr/local/lib/gcc7/gcc/x86_64-portbld-freebsd12.0/7.3.0/include-fixed"
ignoring nonexistent directory 
"/usr/local/lib/gcc7/gcc/x86_64-portbld-freebsd12.0/7.3.0/../../../../../x86_64-portbld-freebsd12.0/include"
#include "..." search starts here:
#include <...> search starts here:
   /usr/local/lib/gcc7/include/c++/
   /usr/local/lib/gcc7/include/c++//x86_64-portbld-freebsd12.0
   /usr/local/lib/gcc7/include/c++//backward
   /usr/local/lib/gcc7/gcc/x86_64-portbld-freebsd12.0/7.3.0/include
   /usr/local/include <-- HERE is why pkg-fallout@ is silent

Sorry you are out of my area of knowledge..
All I know is that the port no longer compiles under amd64.
though It did some months back.
How it selects the compiler to use I have no clue..
I got my pkg using make.conf but that is not a sustainable answer.


   /usr/include
End of search list.


___
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"

Hi Julian,

As Jan said, port's Makefile is broken in a sense that not all of its binary
targets respect CXXFLAGS. I took a stab at unbreaking the build, see
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230466

Sorry to take so long to reply. Thanks a lot for the patch.


BTW, it compiles fine on 112a and 104i with base clang, not sure why original
Makefile had USE_GCC.

Ok so thanks to everyone.  It's been educational.
Will the change in the bug be checked in?

Every few months I recompile all the packages we need at $JOB and each 
time the hope is that we can get all the way through,
tough there is nearly always one that falls over in some new way.. (we 
install a couple of hundred packages.
this time it was sysutils/google-compute-engine-oslogin (and a couple 
of others..)
Hopefully the fixes that go in this time will give me (false) hope of 
a clean run next time  :-)








Because of my lack of experience.


Ah but you did do the port, for which I thank you!.




I couldn't reproduce the error with USE_GCC though https://paste.ee/p/FXNiv
Maybe it is something in my environment (g++6 maybe).

Thank you all
Helen



___
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: workflow question: how do you maintain the port in sync with upstream?

2018-08-13 Thread blubee blubeeme 
On Tue, Aug 14, 2018, 08:26 Helen Koike  wrote:

>
>
> On 08/13/2018 08:00 PM, blubee blubeeme wrote:
> >
> >
> > On Tue, Aug 14, 2018, 06:30 Helen Koike  > > wrote:
> >
> > Hello,
> >
> > I am new to the community, I am maintaining two packages and I would
> > like to check with you if there is a better workflow to do this.
> >
> > The upstream project of the port I am maintaining is held in github,
> and
> > I also have patches in the /usr/ports/sysutils/myport/file/ folder.
> >
> > So I keep a fork of the upstream project with a branch containing a
> > commit with the patches from the /usr/ports/sysutils/myport/file/.
> >
> > Every time I need to update the port to a newer version, I do a git
> pull
> > in this branch, then I run a script [1] to re-generate the patches in
> > the /usr/ports/sysutils/myport/file/
> >
> > This script basically generates a file.orig of all modified files in
> > git, then copy the modified file to WORK_DIR, then run make
> makepatch.
> >
> >
> > for file in ${CHANGES}; do
> > mv ${WORK_DIR}/${file} ${WORK_DIR}/${file}.orig
> > cp ${PROJECT_PATH}/${file} ${WORK_DIR}/${file}
> > done
> > make makepatch
> >
> >
> > I would like to know if there is a better way to do this (some tool
> that
> > I am not aware of?).
> >
> > [1]
> >
> https://github.com/helen-fornazier/bsd-update-patches/blob/master/freebsd-gce-update.sh
> >
> > Thanks
> > Helen
> >
> > ___
> > 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
> > "
> >
> > Submit your patches upstream, once they get accepted your work on
> > FreeBSD is greatly simplified.
> >
> > Best,
> > Owen
> >
>
> I am doing that, but there are some changes that I couldn't include in
> upstream yet.
>
> Helen
>
Can you give an example of types of changes can't be upstream yet and their
reasoning why not?

Best,
Owen

>
___
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: workflow question: how do you maintain the port in sync with upstream?

2018-08-13 Thread Helen Koike 


On 08/13/2018 08:00 PM, blubee blubeeme wrote:
> 
> 
> On Tue, Aug 14, 2018, 06:30 Helen Koike  > wrote:
> 
> Hello,
> 
> I am new to the community, I am maintaining two packages and I would
> like to check with you if there is a better workflow to do this.
> 
> The upstream project of the port I am maintaining is held in github, and
> I also have patches in the /usr/ports/sysutils/myport/file/ folder.
> 
> So I keep a fork of the upstream project with a branch containing a
> commit with the patches from the /usr/ports/sysutils/myport/file/.
> 
> Every time I need to update the port to a newer version, I do a git pull
> in this branch, then I run a script [1] to re-generate the patches in
> the /usr/ports/sysutils/myport/file/
> 
> This script basically generates a file.orig of all modified files in
> git, then copy the modified file to WORK_DIR, then run make makepatch.
> 
> 
> for file in ${CHANGES}; do
>         mv ${WORK_DIR}/${file} ${WORK_DIR}/${file}.orig
>         cp ${PROJECT_PATH}/${file} ${WORK_DIR}/${file}
> done
> make makepatch
> 
> 
> I would like to know if there is a better way to do this (some tool that
> I am not aware of?).
> 
> [1]
> 
> https://github.com/helen-fornazier/bsd-update-patches/blob/master/freebsd-gce-update.sh
> 
> Thanks
> Helen
> 
> ___
> 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
> "
> 
> Submit your patches upstream, once they get accepted your work on
> FreeBSD is greatly simplified. 
> 
> Best, 
> Owen
> 

I am doing that, but there are some changes that I couldn't include in
upstream yet.

Helen
___
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: workflow question: how do you maintain the port in sync with upstream?

2018-08-13 Thread blubee blubeeme 
On Tue, Aug 14, 2018, 06:30 Helen Koike  wrote:

> Hello,
>
> I am new to the community, I am maintaining two packages and I would
> like to check with you if there is a better workflow to do this.
>
> The upstream project of the port I am maintaining is held in github, and
> I also have patches in the /usr/ports/sysutils/myport/file/ folder.
>
> So I keep a fork of the upstream project with a branch containing a
> commit with the patches from the /usr/ports/sysutils/myport/file/.
>
> Every time I need to update the port to a newer version, I do a git pull
> in this branch, then I run a script [1] to re-generate the patches in
> the /usr/ports/sysutils/myport/file/
>
> This script basically generates a file.orig of all modified files in
> git, then copy the modified file to WORK_DIR, then run make makepatch.
>
>
> for file in ${CHANGES}; do
> mv ${WORK_DIR}/${file} ${WORK_DIR}/${file}.orig
> cp ${PROJECT_PATH}/${file} ${WORK_DIR}/${file}
> done
> make makepatch
>
>
> I would like to know if there is a better way to do this (some tool that
> I am not aware of?).
>
> [1]
>
> https://github.com/helen-fornazier/bsd-update-patches/blob/master/freebsd-gce-update.sh
>
> Thanks
> Helen
>
> ___
> 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"
>
Submit your patches upstream, once they get accepted your work on FreeBSD
is greatly simplified.

Best,
Owen

>
___
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: Porting python applications and meeting dependency requirements

2018-08-13 Thread Carsten Larsen 

Thank you! I am already testing.

There are some quirks with the rc.d script, which I will try to fix with 
a pull request upstream.


Regards
Carsten


Den 13-08-2018 kl. 08:49 skrev Yuri:

On 8/12/18 2:52 PM, Carsten Larsen wrote:


I am not so familiar with porting python applications. There seems to 
be some caveats, dependencies being one of them. Question is: Would it 
be difficult to make a port of The Onion Box? Source is on Github:

https://github.com/ralphwetzel/theonionbox



I added the port for theonionbox: 
https://www.freshports.org/security/theonionbox/



Regards,

Yuri


___
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"

___
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: net-mgmt/ocsinventory-ng

2018-08-13 Thread Kurt Jaeger 
Hi!

> Is anyone using this software on FreeBSD?
> The port is at 2.1.2, while 2.5 is out, so I guess it's unmantained.
> 
> Is someone working on this?

There's

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227550

and I added the link to Fernando's patch to that PR.

And: It does not like php7 ? Is that because php7 is untested or
is there a reason behind the limit on php5 ?

-- 
p...@freebsd.org +49 171 3101372  2 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"

Re: net-mgmt/ocsinventory-ng

2018-08-13 Thread Fernando Apesteguía 
On Sat, Aug 11, 2018 at 1:15 AM Kurt Buff  wrote:
>
> I used it about 6-8 years ago, and it was pretty good then, but we
> moved on to commercial alternatives as a management decision.
>
> No idea if it's gotten better or worse since.
>
> Kurt
>
> On Fri, Aug 10, 2018 at 5:59 AM, Andrea Venturoli  wrote:
> > Hello.
> >
> > Is anyone using this software on FreeBSD?
> > The port is at 2.1.2, while 2.5 is out, so I guess it's unmantained.
> >
> > Is someone working on this?

Would you give this one a try?

https://people.freebsd.org/~fernape/patches/ocsinventory.svndiff

It builds on {10.4,11.1}{amd64,i386} and 12i386. Didn't test in other
combinations.

It's a bit difficult for me to test it at the moment.

> >
> > Do you have any alternative to suggest?
> >
> > I'm mainly interested in some inventoring the networks of my customers
> > (mainly PCs and Macs, with hardware data, serial numbers and installed
> > software); I've used OCS in the past and it's more or less what I'm looking
> > for.
> > The simpler, the better; GUI is not a requirement, as long as it stores data
> > in some sort of DB. Synchronous commands would be a big bonus.
> >
> >  bye & Thanks
> > av.
> > ___
> > 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"
> ___
> 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"
___
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: has a framework change broken sysutils/google-compute-engine-oslogin?

2018-08-13 Thread Helen Koike 
Hi all,

On 08/08/2018 03:04 PM, Dmitri Goutnik wrote:
> On 18-08-09 01:16:51, Julian Elischer wrote:
>> On 8/8/18 6:30 pm, Jan Beich wrote:
>>> Julian Elischer  writes:
>>>
 g++ -O2 -pipe -DPANZURA_DEV -DPZ_LONGNAMES -fstack-protector -isystem
 /usr/local/include -fno-strict-aliasing -isystem /usr/local/include
 -fPIC -c pam_module/pam_oslogin_login.cc -o
 pam_module/pam_oslogin_login.o
 g++ -fstack-protector -I/usr/local/include/json-c -o
 google_authorized_keys authorized_keys/authorized_keys.cc
 utils/oslogin_utils.cc -lcurl -ljson-c
 g++ -fstack-protector -Wall -Wstrict-prototypes -fPIC -shared
 -Wl,-soname,libnss_cache_oslogin.so.2 -o
 libnss_cache_google-compute-engine-oslogin-1.3.0.so
 libnss_cache_oslogin/nss_cache_oslogin.o
 libnss_cache_oslogin/compat/getpwent_r.o
 utils/oslogin_utils.cc:16:23: error: curl/curl.h: No such file or
 directory
 utils/oslogin_utils.cc:16:23: error: curl/curl.h: No such file or
 directory
>>> - GCC 4.2.1 (patched) from base system is not a supported configuration
>>>on i386/amd64/aarch64/armv6/armv7
>>> - C*FLAGS aren't consistently respected, see
>>>https://wiki.freebsd.org/WarnerLosh/UsrLocal#Include_paths
>>>https://www.freebsd.org/doc/en/books/porters-handbook/dads-cflags.html
>>>
>>> $ g++7 -v -xc++ -
>>> [...]
>>> ignoring nonexistent directory 
>>> "/usr/local/lib/gcc7/gcc/x86_64-portbld-freebsd12.0/7.3.0/include-fixed"
>>> ignoring nonexistent directory 
>>> "/usr/local/lib/gcc7/gcc/x86_64-portbld-freebsd12.0/7.3.0/../../../../../x86_64-portbld-freebsd12.0/include"
>>> #include "..." search starts here:
>>> #include <...> search starts here:
>>>   /usr/local/lib/gcc7/include/c++/
>>>   /usr/local/lib/gcc7/include/c++//x86_64-portbld-freebsd12.0
>>>   /usr/local/lib/gcc7/include/c++//backward
>>>   /usr/local/lib/gcc7/gcc/x86_64-portbld-freebsd12.0/7.3.0/include
>>>   /usr/local/include <-- HERE is why pkg-fallout@ is silent
>> Sorry you are out of my area of knowledge..
>> All I know is that the port no longer compiles under amd64.
>> though It did some months back.
>> How it selects the compiler to use I have no clue..
>> I got my pkg using make.conf but that is not a sustainable answer.
>>
>>>   /usr/include
>>> End of search list.
>>>
>>
>> ___
>> 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"
> 
> Hi Julian,
> 
> As Jan said, port's Makefile is broken in a sense that not all of its binary 
> targets respect CXXFLAGS. I took a stab at unbreaking the build, see 
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230466

Sorry to take so long to reply. Thanks a lot for the patch.

> 
> BTW, it compiles fine on 112a and 104i with base clang, not sure why original 
> Makefile had USE_GCC.
> 

Because of my lack of experience.


I couldn't reproduce the error with USE_GCC though https://paste.ee/p/FXNiv
Maybe it is something in my environment (g++6 maybe).

Thank you all
Helen
___
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: Porting python applications and meeting dependency requirements

2018-08-13 Thread Yuri 

On 8/12/18 2:52 PM, Carsten Larsen wrote:


I am not so familiar with porting python applications. There seems to 
be some caveats, dependencies being one of them. Question is: Would it 
be difficult to make a port of The Onion Box? Source is on Github:

https://github.com/ralphwetzel/theonionbox



I added the port for theonionbox: 
https://www.freshports.org/security/theonionbox/



Regards,

Yuri


___
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"