Re: openvpn rc script
On Tue, Mar 06, 2018 at 09:17:31PM +, Stuart Henderson wrote: > On 2018/03/06 19:18, Jeremie Courreges-Anglas wrote: > > + > > +# No default daemon_flags, adapt to your needs. > > +daemon="${TRUEPREFIX}/sbin/openvpn --daemon" > > I agree with adding the script, but I think this comment encourages > users to edit the rc file directly. How about: > > # No default daemon_flags, use "rcctl set openvpn flags [...]" > > Or just skipping that and mentioning in README instead? I agree, it belongs in README. -- Antoine
Re: [New] pkgconf 1.4.2
On February 28, 2018 12:27 PM, Adam Steen wrote: > > On February 28, 2018 12:26 PM, Adam Steen a...@adamsteen.com.au wrote: > > > On February 23, 2018 12:37 PM, Stuart Henderson s...@spacehopper.org wrote: > > > > > On 2018/02/23 06:46, Adam Steen wrote: > > > > > > > Thank you that worked perfectly, now for some testing. > > > > > > > > Please note > > > > > > > > pkg-config -> https://www.freedesktop.org/wiki/Software/pkg-config/ > > > > > > > > is different from > > > > > > > > pkgconf -> https://github.com/pkgconf/pkgconf > > > > > > > > Cheers > > > > > > > > Adam > > > > > > Yes, I realise, but pkgconf just copied pkg.m4 from pkg-config. > > > > Hi Stuart > > > > Thank you, I didn't realise. > > > > Hi Ports > > > > Here is a new port "devel/pkgconf", it is needed are part of my long term > > > > goal to port MirageOS/Solo5 to OpenBSD/vmm. > > > > After using it pgfconf over the weekend on my laptop, it appears to be > > working > > > > fine. > > > > I hope to get this committed to ports. > > > > Cheers > > > > Adam > > and attached. Good Morning Ports I would like to get this added, is there anything more I need to do? Cheers Adam pkgconf-1.4.2.tar.gz Description: application/gzip
Re: [update] rsyslog 8.33.1
On Tue, 6 Mar 2018 23:45:50 +0100, Remi Locherer wrote: > > > This updates rsyslogd to the current version and adds two new > > > modules. /usr/ports/sysutils/rsyslog$ make lib-depends-check rsyslog-8.33.1(sysutils/rsyslog,-main): Missing: crypto.42 (/usr/local/sbin/rsyslogd) (system lib) Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/rsyslog/omrelp.so) Missing: intl.6 from gettext-0.19.8.1p1 (/usr/local/lib/rsyslog/omrelp.so) Missing: nghttp2.0 from nghttp2-1.31.0 (/usr/local/sbin/rsyslogd) Missing: ssl.44 (/usr/local/sbin/rsyslogd) (system lib) WANTLIB += crypto iconv intl nghttp2 ssl rsyslog-normalize-8.33.1(sysutils/rsyslog,-normalize): Missing: estr.0 from libestr-0.1.10p0 (/usr/local/lib/rsyslog/mmnormalize.so) Missing: fastjson.0 from libfastjson-0.99.8 (/usr/local/lib/rsyslog/mmnormalize.so) Missing: pthread.25 (/usr/local/lib/rsyslog/mmnormalize.so) (system lib) WANTLIB += estr fastjson pthread rsyslog-pgsql-8.33.1(sysutils/rsyslog,-pgsql): Missing: pthread.25 (/usr/local/lib/rsyslog/ompgsql.so) (system lib) WANTLIB += pthread rsyslog-elasticsearch-8.33.1(sysutils/rsyslog,-elasticsearch): Missing: crypto.42 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: curl.25 from curl-7.58.0p0 (/usr/local/lib/rsyslog/omelasticsearch.so) Missing: m.10 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: nghttp2.0 from nghttp2-1.31.0 (/usr/local/lib/rsyslog/omelasticsearch.so) Missing: pthread.25 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: ssl.44 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: z.5 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) WANTLIB += crypto curl m nghttp2 pthread ssl z Scanning: ok *** Error 1 in /usr/ports/sysutils/rsyslog (/usr/ports/infrastructure/mk/bsd.port.mk:2234 'lib-depends-check') other than that, seems fine > > > The "CFLAGS += -march=i686" seems not to be needed anymore for > > > i386. I guess because clang is now used. I don't know about that but since other didn't say anything, I guess it's fine
LibreOffice, libGL.s0.1 and FireFox
I am now very perplexed by this issue. Installed the March 5th snap and updated all packages, logged in, LibreOffice does not run, cannot find libGL.so.1. Repeated attempts are the same. Until I run FireFox. Once I run Firefox, even if it closes, LibreOffice can be started and run, repeatedly, until the user logs out. Once the user logs out, LibreOffice requires a FireFox start to be successfully run. dmesg below. -- Edward Ahlsen-Girard Ft Walton Beach, FL OpenBSD 6.3-beta (GENERIC.MP) #33: Mon Mar 5 15:20:19 MST 2018 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 4176125952 (3982MB) avail mem = 4042506240 (3855MB) mpath0 at root scsibus0 at mpath0: 256 targets mainbus0 at root bios0 at mainbus0: SMBIOS rev. 2.8 @ 0xdbc40018 (36 entries) bios0: vendor AMI version "80.06" date 04/01/2015 bios0: Hewlett-Packard 550-036 acpi0 at bios0: rev 2 acpi0: sleep states S0 S3 S4 S5 acpi0: tables DSDT FACP APIC FPDT FIDT MSDM SSDT SSDT MCFG HPET SSDT SSDT DBGP acpi0: wakeup devices PXSX(S4) RP01(S4) PXSX(S4) PXSX(S4) PXSX(S4) RP04(S4) PXSX(S4) PXSX(S4) RP06(S4) PXSX(S4) RP07(S4) PXSX(S4) GLAN(S4) EHC1(S3) EHC2(S3) XHC_(S3) [...] acpitimer0 at acpi0: 3579545 Hz, 24 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: Intel(R) Core(TM) i3-4170 CPU @ 3.70GHz, 3691.95 MHz cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT,MELTDOWN cpu0: 256KB 64b/line 8-way L2 cache acpitimer0: recalibrated TSC frequency 3691466034 Hz cpu0: smt 0, core 0, package 0 mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges cpu0: apic clock running at 99MHz cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4, IBE cpu1 at mainbus0: apid 2 (application processor) cpu1: Intel(R) Core(TM) i3-4170 CPU @ 3.70GHz, 3691.45 MHz cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT,MELTDOWN cpu1: 256KB 64b/line 8-way L2 cache cpu1: smt 0, core 1, package 0 cpu2 at mainbus0: apid 1 (application processor) cpu2: Intel(R) Core(TM) i3-4170 CPU @ 3.70GHz, 3691.45 MHz cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT,MELTDOWN cpu2: 256KB 64b/line 8-way L2 cache cpu2: smt 1, core 0, package 0 cpu3 at mainbus0: apid 3 (application processor) cpu3: Intel(R) Core(TM) i3-4170 CPU @ 3.70GHz, 3691.45 MHz cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT,MELTDOWN cpu3: 256KB 64b/line 8-way L2 cache cpu3: smt 1, core 1, package 0 ioapic0 at mainbus0: apid 8 pa 0xfec0, version 20, 24 pins acpimcfg0 at acpi0 addr 0xf800, bus 0-63 acpihpet0 at acpi0: 14318179 Hz acpihpet0: recalibrated TSC frequency 3691469200 Hz acpiprt0 at acpi0: bus 0 (PCI0) acpiprt1 at acpi0: bus 1 (RP01) acpiprt2 at acpi0: bus 2 (RP04) acpiprt3 at acpi0: bus 3 (RP06) acpiprt4 at acpi0: bus 4 (RP07) acpiprt5 at acpi0: bus -1 (PEG0) acpiec0 at acpi0: not present acpicpu0 at acpi0: C2(200@148 mwait.1@0x33), C1(1000@1 mwait.1), PSS acpicpu1 at acpi0: C2(200@148 mwait.1@0x33), C1(1000@1 mwait.1), PSS acpicpu2 at acpi0: C2(200@148 mwait.1@0x33), C1(1000@1 mwait.1), PSS acpicpu3 at acpi0: C2(200@148 mwait.1@0x33), C1(1000@1 mwait.1), PSS acpipwrres0 at acpi0: FN00, resource for FAN0 acpipwrres1 at acpi0: FN01, resource for FAN1 acpipwrres2 at acpi0: FN02, resource for FAN2 acpipwrres3 at acpi0: FN03, resource for FAN3 acpipwrres4 at acpi0: FN04, resource for FAN4 acpitz0 at acpi0: critical temperature is 105 degC acpitz1 at acpi0: critical temperature is 105 degC "INT3F0D" at acpi0 not configured acpibtn0 at acpi0: PWRB "PNP0C14" at acpi0 not configured "PNP0C0B" at acpi0 not configured "PNP0C0B" at acpi0 not configured "PNP0C0B" at acpi0 not configured "PNP0C0B" at acpi0 not configured "PNP0C0B" at acpi0 not configured acpivideo0 at acpi0: GFX0 cpu0: Enhanced SpeedSt
Re: [update] rsyslog 8.33.1
On Tue, Mar 06, 2018 at 10:43:46PM +0100, Remi Locherer wrote: > On Thu, Feb 08, 2018 at 03:17:46PM +0100, Remi Locherer wrote: > > Hi, > > > > This updates rsyslogd to the current version and adds two new modules. > > It needs the updated librelp that I sent earlier. > > > > I looked into upstreaming the remaining patch but that is not necessary. > > The next version of rsyslog will include for all platforms. > > > > I tested it on i386 (imudp + omrelp) and on amd64 (imrelp, ommysql, > > omelasticsearch). > > > > The "CFLAGS += -march=i686" seems not to be needed anymore for i386. > > I guess because clang is now used. > > In the meantime rsyslog 8.33.0 was released. Updated diff below. Few hours ago 8.33.1 was released. In the changelog they say: - 8.33.0 tarball release was actually pre-8.33.0 Everything that I tested with 8.32.0 is still ok. OK? Remi Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- Makefile18 Feb 2018 14:36:30 - 1.39 +++ Makefile6 Mar 2018 21:53:56 - @@ -4,44 +4,53 @@ BROKEN-powerpc = 64-bit atomics (__sync_ COMMENT-main = syslog daemon supporting databases, TCP, SSL, RELP COMMENT-mysql =MySQL plugin for rsyslog +COMMENT-normalize =liblognorm plugin for rsyslog COMMENT-pgsql =PostgreSQL plugin for rsyslog +COMMENT-elasticsearch =Elasticsearch plugin for rsyslog -MULTI_PACKAGES = -main -mysql -pgsql +MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.16.0 +V =8.33.1 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V +PKGNAME-normalize =rsyslog-normalize-$V PKGNAME-pgsql =rsyslog-pgsql-$V +PKGNAME-elasticsearch =rsyslog-elasticsearch-$V CATEGORIES = sysutils -REVISION-main =4 -REVISION-mysql = 1 -REVISION-pgsql = 1 HOMEPAGE = http://www.rsyslog.com/ +MAINTAINER = Remi Locherer + # GPLv3+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB-main +=c estr ffi gcrypt gmp gnutls gpg-error hogweed iconv -WANTLIB-main +=idn2 intl json-c nettle p11-kit pthread relp tasn1 +WANTLIB-main +=c curl estr fastjson ffi gcrypt gmp gnutls gpg-error +WANTLIB-main +=hogweed idn2 nettle p11-kit pthread relp tasn1 WANTLIB-main +=unistring uuid z WANTLIB-mysql += crypto m mysqlclient pthread ssl ${COMPILER_LIBCXX} z +WANTLIB-normalize += lognorm + WANTLIB-pgsql += crypto pq ssl -LIB_DEPENDS-main = devel/json-c \ - devel/libestr>=0.1.2 \ - security/libgcrypt \ - security/gnutls \ - sysutils/librelp>=1.2.9 +LIB_DEPENDS-main = devel/libfastjson \ + devel/libestr \ + net/curl \ + security/libgcrypt \ + security/gnutls \ + sysutils/librelp # XXX should port to using libc UUID functions -LIB_DEPENDS-main +=sysutils/e2fsprogs -LIB_DEPENDS-mysql =databases/mariadb -RUN_DEPENDS-mysql =${PKGNAME-main}:${PKGPATH},-main -LIB_DEPENDS-pgsql =databases/postgresql -RUN_DEPENDS-pgsql =${PKGNAME-main}:${PKGPATH},-main +LIB_DEPENDS-main +=sysutils/e2fsprogs +LIB_DEPENDS-mysql =databases/mariadb +RUN_DEPENDS-mysql =${PKGNAME-main}:${PKGPATH},-main +LIB_DEPENDS-normalize =devel/liblognorm +RUN_DEPENDS-normalize =${PKGNAME-main}:${PKGPATH},-main +LIB_DEPENDS-pgsql =databases/postgresql +RUN_DEPENDS-pgsql =${PKGNAME-main}:${PKGPATH},-main +RUN_DEPENDS-elasticsearch =${PKGNAME-main}:${PKGPATH},-main MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \ http://download.rsyslog.com/rsyslog/ @@ -51,8 +60,10 @@ LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_ARGS += --enable-pgsql \ --enable-mysql \ --enable-mail \ + --enable-mmnormalize \ --enable-gnutls \ --enable-relp \ + --enable-elasticsearch \ --disable-liblogging-stdlog CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" @@ -65,10 +76,5 @@ post-install: ${PREFIX}/share/examples/rsyslog/createDB_mysql.sql ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \ ${PREFIX}/share/examples/rsyslog/createDB_pgsql.sql - -.if ${MACHINE_ARCH:Mi386} -# 64-bit atomics -CFLAGS += -march=i686 -.endif .include Index: disti
Re: UPDATE: burp -> 2.0/2.0.54, stable (2.1.28)
On 2018/03/03 16:20, Jiri B wrote: > On Fri, Mar 02, 2018 at 08:47:01PM +, Stuart Henderson wrote: > > On 2018/02/28 17:32, Jiri B wrote: > > > OK, new diff and tarball attached. > > > > I've cleaned it up a bit. Does it still work for you? > > Yes, it does work. Some comments below. > > Our pkg* tools don't have a method to upgrade between various > branches? I tried to upgrade from 2.0.54 to 2.1.28 and it seems > our pkg* tools can't do it - thus I did pkg_delete and pkg_add. Correct, they're different pkgpaths (and you don't want 2.0.x to auto update to 2.1.x if it's going to break compatibility, and you don't want every. single. update. to ask whether to use 2.0 or 2.1. :-) > While uninstalling 2.0.54 and installing 2.1.28 it revealed > a little change in configuration, 2.1.28 has 'monitor_exe' > option added (so we don't need to keep Landry's patch for this). > But when doing such "upgrade" this little change is not visible. > How to solve this? A 'MESSAGE' or something else? In general: This can happen with normal updates too (it's especially annoying where there are multiple files and some are edited and some aren't). sysmerge -p can help a bit. Specific to this: It probably makes sense to patch client/monitor/status_client_ncurses.c:1482 to provide a sane fallback, then we don't need to touch the config file. 1480 { 1481 static char p[64]=""; 1482 snprintf(p, sizeof(p), "/usr/sbin/%s", PACKAGE_TARNAME); 1483 logp("Using fallback monitor path: %s\n", p); 1484 args[a++]=p; 1485 } So I would remove the config patch, and add this to 2.1/Makefile instead: post-extract: sed -i 's,"/usr/sbin/%s","${TRUEPREFIX}/sbin/%s",' \ ${WRKSRC}/src/client/monitor/status_client_ncurses.c > Thank you for help. It's OK for me. > > Jiri
Re: [update] rsyslog 8.33.0
On Thu, Feb 08, 2018 at 03:17:46PM +0100, Remi Locherer wrote: > Hi, > > This updates rsyslogd to the current version and adds two new modules. > It needs the updated librelp that I sent earlier. > > I looked into upstreaming the remaining patch but that is not necessary. > The next version of rsyslog will include for all platforms. > > I tested it on i386 (imudp + omrelp) and on amd64 (imrelp, ommysql, > omelasticsearch). > > The "CFLAGS += -march=i686" seems not to be needed anymore for i386. > I guess because clang is now used. In the meantime rsyslog 8.33.0 was released. Updated diff below. Feedback, OKs? Remi Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- Makefile18 Feb 2018 14:36:30 - 1.39 +++ Makefile5 Mar 2018 22:56:43 - @@ -4,44 +4,53 @@ BROKEN-powerpc = 64-bit atomics (__sync_ COMMENT-main = syslog daemon supporting databases, TCP, SSL, RELP COMMENT-mysql =MySQL plugin for rsyslog +COMMENT-normalize =liblognorm plugin for rsyslog COMMENT-pgsql =PostgreSQL plugin for rsyslog +COMMENT-elasticsearch =Elasticsearch plugin for rsyslog -MULTI_PACKAGES = -main -mysql -pgsql +MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.16.0 +V =8.33.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V +PKGNAME-normalize =rsyslog-normalize-$V PKGNAME-pgsql =rsyslog-pgsql-$V +PKGNAME-elasticsearch =rsyslog-elasticsearch-$V CATEGORIES = sysutils -REVISION-main =4 -REVISION-mysql = 1 -REVISION-pgsql = 1 HOMEPAGE = http://www.rsyslog.com/ +MAINTAINER = Remi Locherer + # GPLv3+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB-main +=c estr ffi gcrypt gmp gnutls gpg-error hogweed iconv -WANTLIB-main +=idn2 intl json-c nettle p11-kit pthread relp tasn1 +WANTLIB-main +=c curl estr fastjson ffi gcrypt gmp gnutls gpg-error +WANTLIB-main +=hogweed idn2 nettle p11-kit pthread relp tasn1 WANTLIB-main +=unistring uuid z WANTLIB-mysql += crypto m mysqlclient pthread ssl ${COMPILER_LIBCXX} z +WANTLIB-normalize += lognorm + WANTLIB-pgsql += crypto pq ssl -LIB_DEPENDS-main = devel/json-c \ - devel/libestr>=0.1.2 \ - security/libgcrypt \ - security/gnutls \ - sysutils/librelp>=1.2.9 +LIB_DEPENDS-main = devel/libfastjson \ + devel/libestr \ + net/curl \ + security/libgcrypt \ + security/gnutls \ + sysutils/librelp # XXX should port to using libc UUID functions -LIB_DEPENDS-main +=sysutils/e2fsprogs -LIB_DEPENDS-mysql =databases/mariadb -RUN_DEPENDS-mysql =${PKGNAME-main}:${PKGPATH},-main -LIB_DEPENDS-pgsql =databases/postgresql -RUN_DEPENDS-pgsql =${PKGNAME-main}:${PKGPATH},-main +LIB_DEPENDS-main +=sysutils/e2fsprogs +LIB_DEPENDS-mysql =databases/mariadb +RUN_DEPENDS-mysql =${PKGNAME-main}:${PKGPATH},-main +LIB_DEPENDS-normalize =devel/liblognorm +RUN_DEPENDS-normalize =${PKGNAME-main}:${PKGPATH},-main +LIB_DEPENDS-pgsql =databases/postgresql +RUN_DEPENDS-pgsql =${PKGNAME-main}:${PKGPATH},-main +RUN_DEPENDS-elasticsearch =${PKGNAME-main}:${PKGPATH},-main MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \ http://download.rsyslog.com/rsyslog/ @@ -51,8 +60,10 @@ LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_ARGS += --enable-pgsql \ --enable-mysql \ --enable-mail \ + --enable-mmnormalize \ --enable-gnutls \ --enable-relp \ + --enable-elasticsearch \ --disable-liblogging-stdlog CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" @@ -65,10 +76,5 @@ post-install: ${PREFIX}/share/examples/rsyslog/createDB_mysql.sql ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \ ${PREFIX}/share/examples/rsyslog/createDB_pgsql.sql - -.if ${MACHINE_ARCH:Mi386} -# 64-bit atomics -CFLAGS += -march=i686 -.endif .include Index: distinfo === RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo15 Mar 2016 23:25:51 - 1.4 +++ distinfo26 Feb 201
Re: openvpn rc script
On 2018/03/06 19:18, Jeremie Courreges-Anglas wrote: > + > +# No default daemon_flags, adapt to your needs. > +daemon="${TRUEPREFIX}/sbin/openvpn --daemon" I agree with adding the script, but I think this comment encourages users to edit the rc file directly. How about: # No default daemon_flags, use "rcctl set openvpn flags [...]" Or just skipping that and mentioning in README instead?
Re: openvpn rc script
On Tue, Mar 06, 2018 at 07:18:53PM +0100, Jeremie Courreges-Anglas wrote: > > Daniel and I have been discussing the addition of a simple openvpn rc > script, months ago. Maybe this can be useful to others? > > Feedback / ok? I use a very similar rc script. ok remi@ > > Index: Makefile > === > RCS file: /cvs/ports/net/openvpn/Makefile,v > retrieving revision 1.88 > diff -u -p -r1.88 Makefile > --- Makefile 6 Mar 2018 12:44:29 - 1.88 > +++ Makefile 6 Mar 2018 12:53:00 - > @@ -3,7 +3,7 @@ > COMMENT= easy-to-use, robust, and highly configurable VPN > > DISTNAME=openvpn-2.4.5 > -REVISION=0 > +REVISION=1 > CATEGORIES= net security > > HOMEPAGE=https://openvpn.net/index.php/open-source/ > Index: pkg/PLIST > === > RCS file: /cvs/ports/net/openvpn/pkg/PLIST,v > retrieving revision 1.22 > diff -u -p -r1.22 PLIST > --- pkg/PLIST 29 Sep 2017 16:36:23 - 1.22 > +++ pkg/PLIST 6 Mar 2018 12:53:00 - > @@ -63,3 +63,4 @@ share/examples/openvpn/sample-scripts/br > share/examples/openvpn/sample-scripts/bridge-stop > share/examples/openvpn/sample-scripts/ucn.pl > share/examples/openvpn/sample-scripts/verify-cn > +@rcscript ${RCDIR}/openvpn > Index: pkg/openvpn.rc > === > RCS file: pkg/openvpn.rc > diff -N pkg/openvpn.rc > --- /dev/null 1 Jan 1970 00:00:00 - > +++ pkg/openvpn.rc6 Mar 2018 12:53:00 - > @@ -0,0 +1,10 @@ > +#!/bin/ksh > +# > +# $OpenBSD$ > + > +# No default daemon_flags, adapt to your needs. > +daemon="${TRUEPREFIX}/sbin/openvpn --daemon" > + > +. /etc/rc.d/rc.subr > + > +rc_cmd $1 > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update sysutils/pciutils to 3.5.6
On Wed, Mar 07, 2018 at 12:08:49AM +1100, Jonathan Gray wrote: > > MAINTAINER = Matthieu Herrb > Hi, FWIW, you can take over maintainership of the port. I've completly failed to do it over the last years. -- Matthieu Herrb
Re: openvpn rc script
On Tue, 06 Mar 2018 19:18:53 +0100, Jeremie Courreges-Anglas wrote: > Feedback / ok? fuck yeah!
openvpn rc script
Daniel and I have been discussing the addition of a simple openvpn rc script, months ago. Maybe this can be useful to others? Feedback / ok? Index: Makefile === RCS file: /cvs/ports/net/openvpn/Makefile,v retrieving revision 1.88 diff -u -p -r1.88 Makefile --- Makefile6 Mar 2018 12:44:29 - 1.88 +++ Makefile6 Mar 2018 12:53:00 - @@ -3,7 +3,7 @@ COMMENT= easy-to-use, robust, and highly configurable VPN DISTNAME= openvpn-2.4.5 -REVISION= 0 +REVISION= 1 CATEGORIES=net security HOMEPAGE= https://openvpn.net/index.php/open-source/ Index: pkg/PLIST === RCS file: /cvs/ports/net/openvpn/pkg/PLIST,v retrieving revision 1.22 diff -u -p -r1.22 PLIST --- pkg/PLIST 29 Sep 2017 16:36:23 - 1.22 +++ pkg/PLIST 6 Mar 2018 12:53:00 - @@ -63,3 +63,4 @@ share/examples/openvpn/sample-scripts/br share/examples/openvpn/sample-scripts/bridge-stop share/examples/openvpn/sample-scripts/ucn.pl share/examples/openvpn/sample-scripts/verify-cn +@rcscript ${RCDIR}/openvpn Index: pkg/openvpn.rc === RCS file: pkg/openvpn.rc diff -N pkg/openvpn.rc --- /dev/null 1 Jan 1970 00:00:00 - +++ pkg/openvpn.rc 6 Mar 2018 12:53:00 - @@ -0,0 +1,10 @@ +#!/bin/ksh +# +# $OpenBSD$ + +# No default daemon_flags, adapt to your needs. +daemon="${TRUEPREFIX}/sbin/openvpn --daemon" + +. /etc/rc.d/rc.subr + +rc_cmd $1 -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: build libLLVM.so in devel/llvm
On 3/6/2018 7:47 AM, Stuart Henderson wrote: > On 2018/03/06 21:32, Jonathan Gray wrote: >> On Sat, Feb 17, 2018 at 11:12:44PM +1100, Jonathan Gray wrote: >>> On Thu, Feb 15, 2018 at 05:08:56PM +, Stuart Henderson wrote: On 2018/02/15 11:19, Brian Callahan wrote: > On 02/15/18 10:02, Jonathan Gray wrote: >> Build libLLVM.so and link tools with it. >> >> This seems to be the way almost all Linux distributions and BSDs >> ship LLVM and is what Mesa expects. >> >> Use the documented cmake var for RTTI while here. > Any reason not to use the SHARED_LIBS facility of ports for libLLVM, like > libclang and libLTO already do in the LLVM port? agreed, it's a bit non-obvious that it might be needed because unlike other build systems (which normally use a default value if not passed via SHARED_LIBS) the way we've got cmake setup it just skips the library version in that case.. >>> Trying to use SHARED_LIBS breaks and isn't so useful as the name >>> of the library includes the major/minor llvm version with the abi >>> unlikely to change on new release based from the same branch. >>> >>> The intent seems to be to allow multiple versions to be installed >>> concurrently as llvm breaks abi/api between most releases. >>> >>> Warning: symlink(s) point to non-existent >>> /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.so >>> /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.1.so >>> /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM.so >>> >>> $ ls -l /usr/local/lib/libLLVM*.so* >>> lrwxr-xr-x 1 root wheel14 Feb 17 22:55 >>> /usr/local/lib/libLLVM-5.0.1.so -> libLLVM-5.0.so >>> -rw-r--r-- 1 root bin61453686 Feb 17 22:47 >>> /usr/local/lib/libLLVM-5.0.so.0.0 >>> lrwxr-xr-x 1 root wheel14 Feb 17 22:55 /usr/local/lib/libLLVM.so >>> -> libLLVM-5.0.so >>> >>> $ llvm-config --link-shared >>> llvm-config: error: libLLVM-5.0.so is missing >>> $ llvm-config --shared-mode >>> static >> So would anyone be opposed to the first diff in this thread going in? > The potential issue with this is that if things in ports start linking > to it, we'll run into problems with updates. > > That said I don't really have a better idea and I don't want to get in > the way of your work on Mesa, so OK sthen@ but think we will need to keep > an eye on it. > Same ok with me. Go ahead.
Re: update sysutils/pciutils to 3.5.6
On Wed, Mar 07, 2018 at 12:08:49AM +1100, Jonathan Gray wrote: > On Tue, Mar 06, 2018 at 01:01:32PM +, Stuart Henderson wrote: > > Changelog looks sane and no removed symbols so I wouldn't expect > > problems with chromium/iridium. The sysutils/flashrom patch mess still > > works. > > > > Could you update HOMEPAGE and MASTER_SITES please? I think this would > > be best: > > > > HOMEPAGE= https://mj.ucw.cz/sw/pciutils/ > > MASTER_SITES= https://www.kernel.org/pub/software/utils/pciutils/ \ > > ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ > > https://www.ibiblio.org/pub/Linux/hardware/ > > > > (ftp.kernel.org is no more. metalab.unc.edu no longer answers ftp, > > and it answers http with a redirect to ibiblio). > > > > Otherwise OK with me. > > thanks, ibiblio only has an old distfile (3.1.7) so I'll just drop it > > Index: Makefile > === > RCS file: /cvs/ports/sysutils/pciutils/Makefile,v > retrieving revision 1.20 > diff -u -p -r1.20 Makefile > --- Makefile 1 Sep 2016 10:53:27 - 1.20 > +++ Makefile 6 Mar 2018 13:05:40 - > @@ -4,10 +4,10 @@ NOT_FOR_ARCHS = m88k > > COMMENT =PCI bus configuration register access tools > > -DISTNAME = pciutils-3.3.1 > +DISTNAME = pciutils-3.5.6 > CATEGORIES = sysutils > > -HOMEPAGE = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml > +HOMEPAGE = https://mj.ucw.cz/sw/pciutils/ > > MAINTAINER = Matthieu Herrb > > @@ -16,9 +16,8 @@ PERMIT_PACKAGE_CDROM = Yes > > WANTLIB =c z > > -MASTER_SITES = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ > - ftp://ftp.kernel.org/pub/software/utils/pciutils/ \ > - ftp://metalab.unc.edu/pub/Linux/hardware/ > +MASTER_SITES = > https://www.kernel.org/pub/software/utils/pciutils/ \ > + ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ > > USE_GMAKE = Yes > > Index: distinfo > === > RCS file: /cvs/ports/sysutils/pciutils/distinfo,v > retrieving revision 1.8 > diff -u -p -r1.8 distinfo > --- distinfo 11 Apr 2015 08:25:10 - 1.8 > +++ distinfo 6 Mar 2018 09:14:29 - > @@ -1,2 +1,2 @@ > -SHA256 (pciutils-3.3.1.tar.gz) = Ar7rFFA3B8WjKT/ghMGOEuaTfA1N0eKea8trEvEk30Y= > -SIZE (pciutils-3.3.1.tar.gz) = 393912 > +SHA256 (pciutils-3.5.6.tar.gz) = DU1QfTlecnOEc308Rc+MWgAjhkputcbtfK99SDmVOR0= > +SIZE (pciutils-3.5.6.tar.gz) = 442190 Had 3.5.6 in my queue as well, thanks for beating me to it. Works fine here, OK kn.
Re: [NEW] converters/p5-Sereal-Encoder
On Sun, Feb 25, 2018 at 04:13:38PM +0100, Frederic Cambus wrote: > Here is a new port: converters/p5-Sereal-Encoder I had some problems with linking -lzstd especially when this package was installed. I would recommend to add archivers/zstd as lib dependency and always use the library from the existing package. Also for the included Devel::CheckLib we have a package. I prefer to add dependencies and remove the included stuff. Then I am sure which software is used after all this build magic. I think the following things should change: - There are some source files with different license, the comment should include them. - add zstd to wantlib - depend on devel/p5-Devel-CheckLib and archivers/zstd - according to Makefile.PL p5-Sereal-Decoder version >=4.002 is needed for testing. I prefer to keep the version in sync with our test dependecies. - remove the unused Devel/CheckLib and zstd - patch to search for libraries in /usr/local I have included my proposed changes for p5-Sereal-Encoder. bluhm # $OpenBSD$ COMMENT = fast, compact, powerful binary serialization DISTNAME = Sereal-Encoder-4.005 CATEGORIES =converters MAINTAINER =Frederic Cambus # Perl, BSD, LGPLv2.1 PERMIT_PACKAGE_CDROM = Yes WANTLIB = c perl zstd MODULES = cpan BUILD_DEPENDS = devel/p5-Devel-CheckLib LIB_DEPENDS = archivers/zstd TEST_DEPENDS = converters/p5-Sereal-Decoder>=4.002 \ devel/p5-Test-Deep \ devel/p5-Test-Differences \ devel/p5-Test-LongString \ devel/p5-Test-Warn CPAN_AUTHOR = YVES post-extract: rm -r -- ${WRKSRC}/inc/Devel ${WRKSRC}/zstd pre-configure: ${SUBST_CMD} ${WRKSRC}/Makefile.PL .include $OpenBSD$ Index: Makefile.PL --- Makefile.PL.orig +++ Makefile.PL @@ -91,9 +91,9 @@ inc::Sereal::BuildTools::WriteMakefile( LICENSE => 'perl', ABSTRACT_FROM => 'lib/Sereal/Encoder.pm', AUTHOR => 'Steffen Mueller , Yves Orton ', -LIBS => [$libs], # e.g., '-lm' +LIBS => ["-L${LOCALBASE}/lib $libs"], # e.g., '-lm' DEFINE=> $defines, -INC => '-I.', # e.g., '-I. -I/usr/include/other' +INC => "-I. -I${LOCALBASE}/include", # e.g., '-I. -I/usr/include/other' OPTIMIZE => $optimize, DIR => $subdirs, OBJECT=> $objects,
Re: New port: arx-libertatis
On Mon, Mar 05, 2018 at 08:53:05AM +, Stuart Henderson wrote: > On 2018/03/04 11:05, Thomas Frohwein wrote: > > On Sun, Mar 04, 2018 at 05:31:31PM +1100, Jonathan Gray wrote: > > > 1.1.2-r1 may map to 1.1.2pl1 (1.1.2 patch level 1) if I read > > > packages-specs(7) correctly as there was a 1.1.2 release prior to r1. > > > > I looked through packages. There are a few packages with pl0 (apvlv, > > inotify-tools, and xarchiver) and since we also start with v0 and p0, I set > > this > > to arx-libertatis-1.1.2pl0. > > the number after pl usually maps directly to something from upstream, > I'd go for: See packages-specs(7) version knows how to handle standard suffixes rcN, betaN, preN, plN with the usual upstream semantics (release candidate, beta, pre-release, patch-level) As opposed to EPOCH and REVISION, which map to pN vN and are specific to OpenBSD.
Re: update sysutils/pciutils to 3.5.6
On Tue, Mar 06, 2018 at 01:01:32PM +, Stuart Henderson wrote: > Changelog looks sane and no removed symbols so I wouldn't expect > problems with chromium/iridium. The sysutils/flashrom patch mess still > works. > > Could you update HOMEPAGE and MASTER_SITES please? I think this would > be best: > > HOMEPAGE= https://mj.ucw.cz/sw/pciutils/ > MASTER_SITES= https://www.kernel.org/pub/software/utils/pciutils/ \ > ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ > https://www.ibiblio.org/pub/Linux/hardware/ > > (ftp.kernel.org is no more. metalab.unc.edu no longer answers ftp, > and it answers http with a redirect to ibiblio). > > Otherwise OK with me. thanks, ibiblio only has an old distfile (3.1.7) so I'll just drop it Index: Makefile === RCS file: /cvs/ports/sysutils/pciutils/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile1 Sep 2016 10:53:27 - 1.20 +++ Makefile6 Mar 2018 13:05:40 - @@ -4,10 +4,10 @@ NOT_FOR_ARCHS = m88k COMMENT = PCI bus configuration register access tools -DISTNAME = pciutils-3.3.1 +DISTNAME = pciutils-3.5.6 CATEGORIES = sysutils -HOMEPAGE = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml +HOMEPAGE = https://mj.ucw.cz/sw/pciutils/ MAINTAINER = Matthieu Herrb @@ -16,9 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes WANTLIB = c z -MASTER_SITES = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ - ftp://ftp.kernel.org/pub/software/utils/pciutils/ \ - ftp://metalab.unc.edu/pub/Linux/hardware/ +MASTER_SITES = https://www.kernel.org/pub/software/utils/pciutils/ \ + ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ USE_GMAKE =Yes Index: distinfo === RCS file: /cvs/ports/sysutils/pciutils/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo11 Apr 2015 08:25:10 - 1.8 +++ distinfo6 Mar 2018 09:14:29 - @@ -1,2 +1,2 @@ -SHA256 (pciutils-3.3.1.tar.gz) = Ar7rFFA3B8WjKT/ghMGOEuaTfA1N0eKea8trEvEk30Y= -SIZE (pciutils-3.3.1.tar.gz) = 393912 +SHA256 (pciutils-3.5.6.tar.gz) = DU1QfTlecnOEc308Rc+MWgAjhkputcbtfK99SDmVOR0= +SIZE (pciutils-3.5.6.tar.gz) = 442190
Re: update sysutils/pciutils to 3.5.6
Changelog looks sane and no removed symbols so I wouldn't expect problems with chromium/iridium. The sysutils/flashrom patch mess still works. Could you update HOMEPAGE and MASTER_SITES please? I think this would be best: HOMEPAGE= https://mj.ucw.cz/sw/pciutils/ MASTER_SITES= https://www.kernel.org/pub/software/utils/pciutils/ \ ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ https://www.ibiblio.org/pub/Linux/hardware/ (ftp.kernel.org is no more. metalab.unc.edu no longer answers ftp, and it answers http with a redirect to ibiblio). Otherwise OK with me. On 2018/03/06 20:40, Jonathan Gray wrote: > Index: Makefile > === > RCS file: /cvs/ports/sysutils/pciutils/Makefile,v > retrieving revision 1.20 > diff -u -p -r1.20 Makefile > --- Makefile 1 Sep 2016 10:53:27 - 1.20 > +++ Makefile 6 Mar 2018 09:14:15 - > @@ -4,7 +4,7 @@ NOT_FOR_ARCHS = m88k > > COMMENT =PCI bus configuration register access tools > > -DISTNAME = pciutils-3.3.1 > +DISTNAME = pciutils-3.5.6 > CATEGORIES = sysutils > > HOMEPAGE = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml > Index: distinfo > === > RCS file: /cvs/ports/sysutils/pciutils/distinfo,v > retrieving revision 1.8 > diff -u -p -r1.8 distinfo > --- distinfo 11 Apr 2015 08:25:10 - 1.8 > +++ distinfo 6 Mar 2018 09:14:29 - > @@ -1,2 +1,2 @@ > -SHA256 (pciutils-3.3.1.tar.gz) = Ar7rFFA3B8WjKT/ghMGOEuaTfA1N0eKea8trEvEk30Y= > -SIZE (pciutils-3.3.1.tar.gz) = 393912 > +SHA256 (pciutils-3.5.6.tar.gz) = DU1QfTlecnOEc308Rc+MWgAjhkputcbtfK99SDmVOR0= > +SIZE (pciutils-3.5.6.tar.gz) = 442190 >
Re: build libLLVM.so in devel/llvm
On 2018/03/06 21:32, Jonathan Gray wrote: > On Sat, Feb 17, 2018 at 11:12:44PM +1100, Jonathan Gray wrote: > > On Thu, Feb 15, 2018 at 05:08:56PM +, Stuart Henderson wrote: > > > On 2018/02/15 11:19, Brian Callahan wrote: > > > > > > > > On 02/15/18 10:02, Jonathan Gray wrote: > > > > > Build libLLVM.so and link tools with it. > > > > > > > > > > This seems to be the way almost all Linux distributions and BSDs > > > > > ship LLVM and is what Mesa expects. > > > > > > > > > > Use the documented cmake var for RTTI while here. > > > > > > > > Any reason not to use the SHARED_LIBS facility of ports for libLLVM, > > > > like > > > > libclang and libLTO already do in the LLVM port? > > > > > > agreed, it's a bit non-obvious that it might be needed because unlike > > > other build systems (which normally use a default value if not passed > > > via SHARED_LIBS) the way we've got cmake setup it just skips the library > > > version in that case.. > > > > > > > Trying to use SHARED_LIBS breaks and isn't so useful as the name > > of the library includes the major/minor llvm version with the abi > > unlikely to change on new release based from the same branch. > > > > The intent seems to be to allow multiple versions to be installed > > concurrently as llvm breaks abi/api between most releases. > > > > Warning: symlink(s) point to non-existent > > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.so > > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.1.so > > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM.so > > > > $ ls -l /usr/local/lib/libLLVM*.so* > > lrwxr-xr-x 1 root wheel14 Feb 17 22:55 > > /usr/local/lib/libLLVM-5.0.1.so -> libLLVM-5.0.so > > -rw-r--r-- 1 root bin61453686 Feb 17 22:47 > > /usr/local/lib/libLLVM-5.0.so.0.0 > > lrwxr-xr-x 1 root wheel14 Feb 17 22:55 /usr/local/lib/libLLVM.so > > -> libLLVM-5.0.so > > > > $ llvm-config --link-shared > > llvm-config: error: libLLVM-5.0.so is missing > > $ llvm-config --shared-mode > > static > > So would anyone be opposed to the first diff in this thread going in? The potential issue with this is that if things in ports start linking to it, we'll run into problems with updates. That said I don't really have a better idea and I don't want to get in the way of your work on Mesa, so OK sthen@ but think we will need to keep an eye on it.
Re: [update] librelp 1.2.14
On Mon, Mar 05 2018, Remi Locherer wrote: > On Thu, Feb 08, 2018 at 09:52:47AM -0600, Todd T. Fries wrote: >> I agree with the logic, but have not tested. I'd additionally >> be fine with: >> >> -MAINTAINER =Todd T. Fries >> +MAINTAINER =Remi Locherer >> >> Thanks, >> >> Penned by Remi Locherer on 20180208 3:56.25, we have: >> | ping >> | >> | On Wed, Jan 24, 2018 at 11:46:01PM +0100, Remi Locherer wrote: >> | > Hi, >> | > >> | > This updates librelp to 1.2.14. I verified that rsyslogd from ports >> | > still works with the updated version. I tested on i386 (rsyslog with >> | > omrelp) and on amd64 (rsyslogd with imrelp). >> | > >> | > OK? > > Updated diff below following suggestions from Todd (MAINTAINER) and > Klemens (line order). > > This update is required for new versions of rsyslogd. > > Comments? OKs? LGTM, ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: build libLLVM.so in devel/llvm
On Sat, Feb 17, 2018 at 11:12:44PM +1100, Jonathan Gray wrote: > On Thu, Feb 15, 2018 at 05:08:56PM +, Stuart Henderson wrote: > > On 2018/02/15 11:19, Brian Callahan wrote: > > > > > > On 02/15/18 10:02, Jonathan Gray wrote: > > > > Build libLLVM.so and link tools with it. > > > > > > > > This seems to be the way almost all Linux distributions and BSDs > > > > ship LLVM and is what Mesa expects. > > > > > > > > Use the documented cmake var for RTTI while here. > > > > > > Any reason not to use the SHARED_LIBS facility of ports for libLLVM, like > > > libclang and libLTO already do in the LLVM port? > > > > agreed, it's a bit non-obvious that it might be needed because unlike > > other build systems (which normally use a default value if not passed > > via SHARED_LIBS) the way we've got cmake setup it just skips the library > > version in that case.. > > > > Trying to use SHARED_LIBS breaks and isn't so useful as the name > of the library includes the major/minor llvm version with the abi > unlikely to change on new release based from the same branch. > > The intent seems to be to allow multiple versions to be installed > concurrently as llvm breaks abi/api between most releases. > > Warning: symlink(s) point to non-existent > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.so > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.1.so > /usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM.so > > $ ls -l /usr/local/lib/libLLVM*.so* > lrwxr-xr-x 1 root wheel14 Feb 17 22:55 > /usr/local/lib/libLLVM-5.0.1.so -> libLLVM-5.0.so > -rw-r--r-- 1 root bin61453686 Feb 17 22:47 > /usr/local/lib/libLLVM-5.0.so.0.0 > lrwxr-xr-x 1 root wheel14 Feb 17 22:55 /usr/local/lib/libLLVM.so -> > libLLVM-5.0.so > > $ llvm-config --link-shared > llvm-config: error: libLLVM-5.0.so is missing > $ llvm-config --shared-mode > static So would anyone be opposed to the first diff in this thread going in? > > Index: Makefile > === > RCS file: /cvs/ports/devel/llvm/Makefile,v > retrieving revision 1.172 > diff -u -p -r1.172 Makefile > --- Makefile 2 Feb 2018 13:33:11 - 1.172 > +++ Makefile 17 Feb 2018 11:59:08 - > @@ -14,11 +14,12 @@ COMMENT-main =modular, fast C/C++/ObjC > COMMENT-python = Python bindings for Clang > > LLVM_V = 5.0.1 > +LLVM_BRANCH =${LLVM_V:C/\.[^\.]*$//} > DISTNAME = llvm-${LLVM_V}.src > PKGNAME =llvm-${LLVM_V} > PKGNAME-main = llvm-${LLVM_V} > PKGNAME-python = py-llvm-${LLVM_V} > -REVISION-main = 1 > +REVISION-main = 2 > CATEGORIES = devel > DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \ > cfe-${LLVM_V}.src${EXTRACT_SUFX} \ > @@ -27,7 +28,8 @@ MASTER_SITES = https://www.llvm.org/rele > EXTRACT_SUFX = .tar.xz > > SHARED_LIBS =clang 6.0 \ > - LTO 3.0 > + LTO 3.0 \ > + LLVM-${LLVM_BRANCH} 0.0 > > # packager notes in http://llvm.org/docs/Packaging.html > HOMEPAGE = http://www.llvm.org/ > @@ -55,10 +57,12 @@ RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS > LIB_DEPENDS-python = ${BUILD_PKGPATH},-main > > SEPARATE_BUILD = Yes > -CONFIGURE_ARGS = -DLLVM_ENABLE_FFI:Bool=False \ > +CONFIGURE_ARGS = -DLLVM_ENABLE_FFI:Bool=True \ > -DLLVM_ENABLE_TERMINFO:Bool=False \ > - -DLLVM_REQUIRES_RTTI:Bool=True \ > + -DLLVM_ENABLE_RTTI:Bool=True \ > -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \ > + -DLLVM_LINK_LLVM_DYLIB:Bool=True \ > + -DLLVM_BUILD_LLVM_DYLIB:Bool=True \ > -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND \ > -DBacktrace_LIBRARY='' > > Index: patches/patch-tools_llvm-shlib_CMakeLists_txt > === > RCS file: patches/patch-tools_llvm-shlib_CMakeLists_txt > diff -N patches/patch-tools_llvm-shlib_CMakeLists_txt > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-tools_llvm-shlib_CMakeLists_txt 17 Feb 2018 11:59:08 > - > @@ -0,0 +1,26 @@ > +$OpenBSD$ > + > +fix symbols not getting added to shared library > + > +Index: tools/llvm-shlib/CMakeLists.txt > +--- tools/llvm-shlib/CMakeLists.txt.orig > tools/llvm-shlib/CMakeLists.txt > +@@ -37,15 +37,15 @@ endif() > + add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) > + > + list(REMOVE_DUPLICATES LIB_NAMES) > +-if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) OR > ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" > STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf" > ++if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") > ++ set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) > ++else() > + configure_file( > + $
update sysutils/pciutils to 3.5.6
Index: Makefile === RCS file: /cvs/ports/sysutils/pciutils/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile1 Sep 2016 10:53:27 - 1.20 +++ Makefile6 Mar 2018 09:14:15 - @@ -4,7 +4,7 @@ NOT_FOR_ARCHS = m88k COMMENT = PCI bus configuration register access tools -DISTNAME = pciutils-3.3.1 +DISTNAME = pciutils-3.5.6 CATEGORIES = sysutils HOMEPAGE = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml Index: distinfo === RCS file: /cvs/ports/sysutils/pciutils/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo11 Apr 2015 08:25:10 - 1.8 +++ distinfo6 Mar 2018 09:14:29 - @@ -1,2 +1,2 @@ -SHA256 (pciutils-3.3.1.tar.gz) = Ar7rFFA3B8WjKT/ghMGOEuaTfA1N0eKea8trEvEk30Y= -SIZE (pciutils-3.3.1.tar.gz) = 393912 +SHA256 (pciutils-3.5.6.tar.gz) = DU1QfTlecnOEc308Rc+MWgAjhkputcbtfK99SDmVOR0= +SIZE (pciutils-3.5.6.tar.gz) = 442190