hi all .
i do not understand lpr .
so my settings are
# ls -l /usr/bin/lpr
lrwxr-xr-x 1 root wheel 18 Jun 1 05:52 /usr/bin/lpr ->
/home/snap/lpr.bat
# cat /home/snap/lpr.bat
lp -dEP-901A
then
seamonkey and leafpad print easily .
---
regards
Thursday, May 31, 2018
Logging to Elasticsearch with syslog-ng
Hi Misc,
I am revisiting the idea of storing log files in Elasticsearch DB for
quick search, analytics, and visualization (Kibana). I would like to
keep my current OpenBSD syslog-ng centralized logging server and just
write logs into ElasticsearchDB instead of flat files. Looks like
Elastricsearch runs happily on OpenBSD
http://openports.se/textproc/elasticsearch
just like Kibana
http://openports.se/www/kibana
I was wondering if the syslog-ng version in ports 3.12.1 (the latest
release seems to be 3.15.1) supports Java plugin needed to send logs
from syslog-ng to Elasticsearch. It looks like 3.12.1 is high enough
version which supports syslog-ng-incubator which was not the case last
time
https://marc.info/?l=openbsd-misc&m=143249546020820&w=2
However I don't see incubator in ports
https://github.com/balabit/syslog-ng-incubator
To be frank by looking quickly through incubator GitHub pages it is not
even clear to me that Java module currently necessary to send things to
Elasticsearch is even the part of the incubator. I stumbled somewhere on
Balabit official documentation which recommends Linux (binary blob
plugins) as the syslog-ng server OS for that very reason.
I do see that Balabit is contemplating writing a native Elasticsearch
destination driver per Google Summer of Code
https://github.com/balabit/syslog-ng/wiki/GSoC-2018-Proposal-:-ElasticSearch-destination:-native(C)-REST-API
Can anybody who is more informed than I on the topic shed some light
onto this topic?
Best,
Predrag
I am revisiting the idea of storing log files in Elasticsearch DB for
quick search, analytics, and visualization (Kibana). I would like to
keep my current OpenBSD syslog-ng centralized logging server and just
write logs into ElasticsearchDB instead of flat files. Looks like
Elastricsearch runs happily on OpenBSD
http://openports.se/textproc/elasticsearch
just like Kibana
http://openports.se/www/kibana
I was wondering if the syslog-ng version in ports 3.12.1 (the latest
release seems to be 3.15.1) supports Java plugin needed to send logs
from syslog-ng to Elasticsearch. It looks like 3.12.1 is high enough
version which supports syslog-ng-incubator which was not the case last
time
https://marc.info/?l=openbsd-misc&m=143249546020820&w=2
However I don't see incubator in ports
https://github.com/balabit/syslog-ng-incubator
To be frank by looking quickly through incubator GitHub pages it is not
even clear to me that Java module currently necessary to send things to
Elasticsearch is even the part of the incubator. I stumbled somewhere on
Balabit official documentation which recommends Linux (binary blob
plugins) as the syslog-ng server OS for that very reason.
I do see that Balabit is contemplating writing a native Elasticsearch
destination driver per Google Summer of Code
https://github.com/balabit/syslog-ng/wiki/GSoC-2018-Proposal-:-ElasticSearch-destination:-native(C)-REST-API
Can anybody who is more informed than I on the topic shed some light
onto this topic?
Best,
Predrag
Re: The compiler error about modifying libcrypto
Hi Theo,
Thanks for your kind reply!
Best Regards
Nan Xiao
On Thu, May 31, 2018 at 7:24 PM, Theo Buehler <tb@openbsd.org> wrote:
> On Thu, May 31, 2018 at 10:50:35AM +0800, Nan Xiao wrote:
>> My OS is OpenBSD 6.3.
>
> -current?
>
> If not, please install the latest snapshot before trying to build
> -current from source.
>
> See also https://www.openbsd.org/faq/current.html
>
>> Since now the -current modify the interface of
>> libcrypto, there is error in "make":
>> ......
>> ===> lib/libcrypto
>
> Don't do "make" from /usr/src.
>
> Please read https://man.openbsd.org/release.8 and follow at least
> up through step 3.
>
> If you have things prepared as described in release(8) and you do
> "make build", it will do "make includes" and install the current
> headers, thus preventing the compilation failure you ran into.
Thanks for your kind reply!
Best Regards
Nan Xiao
On Thu, May 31, 2018 at 7:24 PM, Theo Buehler <tb@openbsd.org> wrote:
> On Thu, May 31, 2018 at 10:50:35AM +0800, Nan Xiao wrote:
>> My OS is OpenBSD 6.3.
>
> -current?
>
> If not, please install the latest snapshot before trying to build
> -current from source.
>
> See also https://www.openbsd.org/faq/current.html
>
>> Since now the -current modify the interface of
>> libcrypto, there is error in "make":
>> ......
>> ===> lib/libcrypto
>
> Don't do "make" from /usr/src.
>
> Please read https://man.openbsd.org/release.8 and follow at least
> up through step 3.
>
> If you have things prepared as described in release(8) and you do
> "make build", it will do "make includes" and install the current
> headers, thus preventing the compilation failure you ran into.
Re: [BUG] Inkscape
Following on this bug, the problem seems to be fixed upstream, but
they didn't update the .xz package of glib2mm, I attach in this mail a
diff with a patch for glib2mm that fixes the problem, I got it from
MacPorts.
Tested and working, finally I can use Inkscape. :)
Cheers,
Elias.
2018-05-29 14:17 GMT-03:00 Elias M. Mariani <marianielias@gmail.com>:
> Forgot to forward to maintainers and stakeholders. :)
>
> 2018-05-29 14:14 GMT-03:00 Elias M. Mariani <marianielias@gmail.com>:
>> This error was reported a couple of days ago:
>> https://marc.info/?l=openbsd-ports&m=152611739309122
>>
>> Following by myself I think that the problem was when changing to
>> clang, the problem seems to be related to gtk2mm:
>> https://bugzilla.gnome.org/show_bug.cgi?id=795338
>>
>> Tested on amd64 and i386, with i3, xfce and fvwm.
>> So I guess that Inkscape is broken until gtk2mm is updated?
>> Bad news for the vectors...
>>
>> Cheers.
>> Elias.
they didn't update the .xz package of glib2mm, I attach in this mail a
diff with a patch for glib2mm that fixes the problem, I got it from
MacPorts.
Tested and working, finally I can use Inkscape. :)
Cheers,
Elias.
2018-05-29 14:17 GMT-03:00 Elias M. Mariani <marianielias@gmail.com>:
> Forgot to forward to maintainers and stakeholders. :)
>
> 2018-05-29 14:14 GMT-03:00 Elias M. Mariani <marianielias@gmail.com>:
>> This error was reported a couple of days ago:
>> https://marc.info/?l=openbsd-ports&m=152611739309122
>>
>> Following by myself I think that the problem was when changing to
>> clang, the problem seems to be related to gtk2mm:
>> https://bugzilla.gnome.org/show_bug.cgi?id=795338
>>
>> Tested on amd64 and i386, with i3, xfce and fvwm.
>> So I guess that Inkscape is broken until gtk2mm is updated?
>> Bad news for the vectors...
>>
>> Cheers.
>> Elias.
Re: Programming for OpenBSD
I would advise start with reading the OpenBSD Mailing List Netiquette first:
(https://www.openbsd.org/mail.html)
Particularly the 5th point from top:
*- Stay on topic*...
On Thu, May 31, 2018 at 7:57 PM, Marc Espie <espie@nerim.net> wrote:
> On Wed, May 30, 2018 at 11:41:00PM -0400, Kevin Burke wrote:
> > Hey guys,
>
> fell asleep waiting for a point.
>
>
(https://www.openbsd.org/mail.html)
Particularly the 5th point from top:
*- Stay on topic*...
On Thu, May 31, 2018 at 7:57 PM, Marc Espie <espie@nerim.net> wrote:
> On Wed, May 30, 2018 at 11:41:00PM -0400, Kevin Burke wrote:
> > Hey guys,
>
> fell asleep waiting for a point.
>
>
Re: Programming for OpenBSD
On Wed, May 30, 2018 at 11:41:00PM -0400, Kevin Burke wrote:
> Hey guys,
fell asleep waiting for a point.
> Hey guys,
fell asleep waiting for a point.
Problem using usb audio device
Hello misc,
I am currently trying to get an usb audio device to work on my system
which fails. My motherboard has an onboard audio interface that gets
detected as azalia device and works without issues.
Additionally I have a Griffin iMic usb audio adapter that I would like
to use instead of the onboard audio device. It gets detected as uaudio0.
Disabling the onboard audio in BIOS lets sndiod automatically connect
the usb device but audio playback results in not working at all and
repeating the following errors in dmesg:
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x01
audio1: failed to start playback
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x84
audio1: failed to start recording
With both audio devices present I also tried to switch the default
device for sndiod to the usb device according to
https://www.openbsd.org/faq/faq13.html which results in the same errors
appearing in dmesg.
rc.conf.local:
sndiod_flags=-f rsnd/1
My audio application (quodlibet) freezes and crashes after a while with
a core dump. Video playback in Firefox also freezes but firefox isn't
crashing.
Has anybody tried this and probably seen this before? Is there more I
can do to debug the issue? Using different usb ports on the system
makes no difference.
Any hint is highly apprechiated
Thanks and regards
Lars
OpenBSD 6.3-current (GENERIC.MP) #55: Thu May 31 07:21:36 MDT 2018
deraadt@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8438255616 (8047MB)
avail mem = 8174370816 (7795MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xd939b018 (75 entries)
bios0: vendor American Megatrends Inc. version "2501" date 07/22/2015
bios0: ASUS All Series
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC FPDT LPIT SSDT SSDT MCFG HPET SSDT SSDT
BGRT acpi0: wakeup devices UAR1(S4) PXSX(S4) RP01(S4) PXSX(S4) PXSX(S4)
RP03(S4) PXSX(S4) PXSX(S4) PXSX(S4) GLAN(S4) EHC1(S4) EHC2(S4) XHC_(S4)
HDEF(S4) PEG0(S4) PEGP(S4) [...] acpitimer0 at acpi0: 3579545 Hz, 24
bits acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat cpu0 at mainbus0:
apid 0 (boot processor) cpu0: Intel(R) Core(TM) i3-4360 CPU @ 3.70GHz,
3691.89 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,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu0: 256KB 64b/line 8-way L2 cache cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
using xsaveopt
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-4360 CPU @ 3.70GHz, 3691.46 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,IBRS,IBPB,STIBP,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-4360 CPU @ 3.70GHz, 3691.46 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,IBRS,IBPB,STIBP,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-4360 CPU @ 3.70GHz, 3691.46 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,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu3: 256KB 64b/line 8-way L2 cache cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 8 pa 0xfec00000, version 20, 24 pins
acpimcfg0 at acpi0 addr 0xf8000000, bus 0-63
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 2 (RP01)
acpiprt2 at acpi0: bus 3 (RP03)
acpiprt3 at acpi0: bus 1 (PEG0)
acpiprt4 at acpi0: bus -1 (PEG1)
acpiprt5 at acpi0: bus -1 (PEG2)
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
acpicmos0 at acpi0
"INT3F0D" at acpi0 not configured
acpibtn0 at acpi0: PWRB
"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
"PNP0A0A" at acpi0 not configured
"PNP0C14" at acpi0 not configured
acpivideo0 at acpi0: GFX0
acpivout0 at acpivideo0: DD1F
cpu0: Enhanced SpeedStep 3691 MHz: speeds: 3700, 3500, 3300, 3100,
2900, 2700, 2500, 2300, 2200, 2000, 1800, 1600, 1400, 1200, 1000, 800
MHz pci0 at mainbus0 bus 0 pchb0 at pci0 dev 0 function 0 "Intel Core
4G Host" rev 0x06 ppb0 at pci0 dev 1 function 0 "Intel Core 4G PCIE"
rev 0x06: msi pci1 at ppb0 bus 1
inteldrm0 at pci0 dev 2 function 0 "Intel HD Graphics 4600" rev 0x06
drm0 at inteldrm0
inteldrm0: msi
inteldrm0: 2560x1440, 32bpp
wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation)
wsdisplay0: screen 1-5 added (std, vt100 emulation)
azalia0 at pci0 dev 3 function 0 "Intel Core 4G HD Audio" rev 0x06: msi
azalia0: No codecs found
xhci0 at pci0 dev 20 function 0 "Intel 8 Series xHCI" rev 0x05: msi,
xHCI 1.0 usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev
3.00/1.00 addr 1 "Intel 8 Series MEI" rev 0x04 at pci0 dev 22 function
0 not configured ehci0 at pci0 dev 26 function 0 "Intel 8 Series USB"
rev 0x05: apic 8 int 20 usb1 at ehci0: USB revision 2.0
uhub1 at usb1 configuration 1 interface 0 "Intel EHCI root hub" rev
2.00/1.00 addr 1 azalia1 at pci0 dev 27 function 0 "Intel 8 Series HD
Audio" rev 0x05: msi azalia1: codecs: Realtek/0x0887
audio0 at azalia1
ppb1 at pci0 dev 28 function 0 "Intel 8 Series PCIE" rev 0xd5: msi
pci2 at ppb1 bus 2
ppb2 at pci0 dev 28 function 2 "Intel 8 Series PCIE" rev 0xd5: msi
pci3 at ppb2 bus 3
re0 at pci3 dev 0 function 0 "Realtek 8168" rev 0x0c: RTL8168G/8111G
(0x4c00), msi, address f8:32:e4:8b:8f:b2 rgephy0 at re0 phy 7: RTL8251
PHY, rev. 0 ehci1 at pci0 dev 29 function 0 "Intel 8 Series USB" rev
0x05: apic 8 int 23 usb2 at ehci1: USB revision 2.0
uhub2 at usb2 configuration 1 interface 0 "Intel EHCI root hub" rev
2.00/1.00 addr 1 pcib0 at pci0 dev 31 function 0 "Intel B85 LPC" rev
0x05 ahci0 at pci0 dev 31 function 2 "Intel 8 Series AHCI" rev 0x05:
msi, AHCI 1.3 ahci0: port 3: 6.0Gb/s
scsibus1 at ahci0: 32 targets
sd0 at scsibus1 targ 3 lun 0: <ATA, Crucial_CT1050MX, M0C> SCSI3
0/direct fixed naa.500a075113f66ec6 sd0: 1001562MB, 512 bytes/sector,
2051200368 sectors, thin ichiic0 at pci0 dev 31 function 3 "Intel 8
Series SMBus" rev 0x05: apic 8 int 18 iic0 at ichiic0
iic0: addr 0x20 01=2a 02=2a 03=16 04=22 05=02 06=e5 07=00 08=00 09=00
0a=00 0b=33 0c=44 0d=88 0e=88 0f=44 10=44 11=00 12=00 13=06 14=00 15=88
16=17 17=ad 18=00 19=8b 1a=40 1b=68 1c=03 1d=3f 1e=3f 1f=00 20=11 21=00
22=03 23=cc 25=24 26=4a 27=20 48=04 49=13 b2=28 b3=a3 words 00=ff2a
01=2a2a 02=2a16 03=1622 04=2202 05=02e5 06=e500 07=0000 spdmem0 at iic0
addr 0x50: 4GB DDR3 SDRAM PC3-12800 spdmem1 at iic0 addr 0x52: 4GB DDR3
SDRAM PC3-12800 isa0 at pcib0 isadma0 at isa0 com0 at isa0 port 0x3f8/8
irq 4: ns16550a, 16 byte fifo pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot) wskbd0 at pckbd0: console keyboard, using
wsdisplay0 pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: VMX/EPT
efifb at mainbus0 not configured
uhub3 at uhub0 port 4 configuration 1 interface 0 "Genesys Logic USB2.0
Hub" rev 2.00/32.98 addr 2 uhidev0 at uhub3 port 3 configuration 1
interface 0 "Dell Dell USB Keyboard" rev 1.10/3.06 addr 3 uhidev0:
iclass 3/1 ukbd0 at uhidev0: 8 variable keys, 6 key codes
wskbd1 at ukbd0 mux 1
wskbd1: connecting to wsdisplay0
uhidev1 at uhub3 port 4 configuration 1 interface 0 "Logitech G400s
Optical Gaming Mouse" rev 2.00/83.00 addr 4 uhidev1: iclass 3/1
ums0 at uhidev1: 8 buttons, Z dir
wsmouse0 at ums0 mux 0
uhidev2 at uhub3 port 4 configuration 1 interface 1 "Logitech G400s
Optical Gaming Mouse" rev 2.00/83.00 addr 4 uhidev2: iclass 3/0, 142
report ids uhid0 at uhidev2 reportid 32: input=0, output=0, feature=1
uhid1 at uhidev2 reportid 128: input=1, output=0, feature=0
uhid2 at uhidev2 reportid 142: input=0, output=0, feature=1
uaudio0 at uhub0 port 6 configuration 1 interface 0 "Griffin
Technology, Inc iMic USB audio system" rev 1.10/0.06 addr 5 uaudio0:
audio rev 1.00, 8 mixer controls audio1 at uaudio0
uhub4 at uhub1 port 1 configuration 1 interface 0 "Intel Rate Matching
Hub" rev 2.00/0.05 addr 2 uhub5 at uhub2 port 1 configuration 1
interface 0 "Intel Rate Matching Hub" rev 2.00/0.05 addr 2 vscsi0 at
root scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
sd1 at scsibus3 targ 1 lun 0: <OPENBSD, SR CRYPTO, 006> SCSI2 0/direct
fixed sd1: 1001561MB, 512 bytes/sector, 2051198753 sectors
root on sd1a (08d3c4078410030f.a) swap on sd1b dump on sd1b
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x01
audio1: failed to start playback
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x84
audio1: failed to start recording
I am currently trying to get an usb audio device to work on my system
which fails. My motherboard has an onboard audio interface that gets
detected as azalia device and works without issues.
Additionally I have a Griffin iMic usb audio adapter that I would like
to use instead of the onboard audio device. It gets detected as uaudio0.
Disabling the onboard audio in BIOS lets sndiod automatically connect
the usb device but audio playback results in not working at all and
repeating the following errors in dmesg:
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x01
audio1: failed to start playback
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x84
audio1: failed to start recording
With both audio devices present I also tried to switch the default
device for sndiod to the usb device according to
https://www.openbsd.org/faq/faq13.html which results in the same errors
appearing in dmesg.
rc.conf.local:
sndiod_flags=-f rsnd/1
My audio application (quodlibet) freezes and crashes after a while with
a core dump. Video playback in Firefox also freezes but firefox isn't
crashing.
Has anybody tried this and probably seen this before? Is there more I
can do to debug the issue? Using different usb ports on the system
makes no difference.
Any hint is highly apprechiated
Thanks and regards
Lars
OpenBSD 6.3-current (GENERIC.MP) #55: Thu May 31 07:21:36 MDT 2018
deraadt@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8438255616 (8047MB)
avail mem = 8174370816 (7795MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xd939b018 (75 entries)
bios0: vendor American Megatrends Inc. version "2501" date 07/22/2015
bios0: ASUS All Series
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC FPDT LPIT SSDT SSDT MCFG HPET SSDT SSDT
BGRT acpi0: wakeup devices UAR1(S4) PXSX(S4) RP01(S4) PXSX(S4) PXSX(S4)
RP03(S4) PXSX(S4) PXSX(S4) PXSX(S4) GLAN(S4) EHC1(S4) EHC2(S4) XHC_(S4)
HDEF(S4) PEG0(S4) PEGP(S4) [...] acpitimer0 at acpi0: 3579545 Hz, 24
bits acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat cpu0 at mainbus0:
apid 0 (boot processor) cpu0: Intel(R) Core(TM) i3-4360 CPU @ 3.70GHz,
3691.89 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,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu0: 256KB 64b/line 8-way L2 cache cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
using xsaveopt
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-4360 CPU @ 3.70GHz, 3691.46 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,IBRS,IBPB,STIBP,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-4360 CPU @ 3.70GHz, 3691.46 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,IBRS,IBPB,STIBP,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-4360 CPU @ 3.70GHz, 3691.46 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,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu3: 256KB 64b/line 8-way L2 cache cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 8 pa 0xfec00000, version 20, 24 pins
acpimcfg0 at acpi0 addr 0xf8000000, bus 0-63
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 2 (RP01)
acpiprt2 at acpi0: bus 3 (RP03)
acpiprt3 at acpi0: bus 1 (PEG0)
acpiprt4 at acpi0: bus -1 (PEG1)
acpiprt5 at acpi0: bus -1 (PEG2)
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
acpicmos0 at acpi0
"INT3F0D" at acpi0 not configured
acpibtn0 at acpi0: PWRB
"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
"PNP0A0A" at acpi0 not configured
"PNP0C14" at acpi0 not configured
acpivideo0 at acpi0: GFX0
acpivout0 at acpivideo0: DD1F
cpu0: Enhanced SpeedStep 3691 MHz: speeds: 3700, 3500, 3300, 3100,
2900, 2700, 2500, 2300, 2200, 2000, 1800, 1600, 1400, 1200, 1000, 800
MHz pci0 at mainbus0 bus 0 pchb0 at pci0 dev 0 function 0 "Intel Core
4G Host" rev 0x06 ppb0 at pci0 dev 1 function 0 "Intel Core 4G PCIE"
rev 0x06: msi pci1 at ppb0 bus 1
inteldrm0 at pci0 dev 2 function 0 "Intel HD Graphics 4600" rev 0x06
drm0 at inteldrm0
inteldrm0: msi
inteldrm0: 2560x1440, 32bpp
wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation)
wsdisplay0: screen 1-5 added (std, vt100 emulation)
azalia0 at pci0 dev 3 function 0 "Intel Core 4G HD Audio" rev 0x06: msi
azalia0: No codecs found
xhci0 at pci0 dev 20 function 0 "Intel 8 Series xHCI" rev 0x05: msi,
xHCI 1.0 usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev
3.00/1.00 addr 1 "Intel 8 Series MEI" rev 0x04 at pci0 dev 22 function
0 not configured ehci0 at pci0 dev 26 function 0 "Intel 8 Series USB"
rev 0x05: apic 8 int 20 usb1 at ehci0: USB revision 2.0
uhub1 at usb1 configuration 1 interface 0 "Intel EHCI root hub" rev
2.00/1.00 addr 1 azalia1 at pci0 dev 27 function 0 "Intel 8 Series HD
Audio" rev 0x05: msi azalia1: codecs: Realtek/0x0887
audio0 at azalia1
ppb1 at pci0 dev 28 function 0 "Intel 8 Series PCIE" rev 0xd5: msi
pci2 at ppb1 bus 2
ppb2 at pci0 dev 28 function 2 "Intel 8 Series PCIE" rev 0xd5: msi
pci3 at ppb2 bus 3
re0 at pci3 dev 0 function 0 "Realtek 8168" rev 0x0c: RTL8168G/8111G
(0x4c00), msi, address f8:32:e4:8b:8f:b2 rgephy0 at re0 phy 7: RTL8251
PHY, rev. 0 ehci1 at pci0 dev 29 function 0 "Intel 8 Series USB" rev
0x05: apic 8 int 23 usb2 at ehci1: USB revision 2.0
uhub2 at usb2 configuration 1 interface 0 "Intel EHCI root hub" rev
2.00/1.00 addr 1 pcib0 at pci0 dev 31 function 0 "Intel B85 LPC" rev
0x05 ahci0 at pci0 dev 31 function 2 "Intel 8 Series AHCI" rev 0x05:
msi, AHCI 1.3 ahci0: port 3: 6.0Gb/s
scsibus1 at ahci0: 32 targets
sd0 at scsibus1 targ 3 lun 0: <ATA, Crucial_CT1050MX, M0C> SCSI3
0/direct fixed naa.500a075113f66ec6 sd0: 1001562MB, 512 bytes/sector,
2051200368 sectors, thin ichiic0 at pci0 dev 31 function 3 "Intel 8
Series SMBus" rev 0x05: apic 8 int 18 iic0 at ichiic0
iic0: addr 0x20 01=2a 02=2a 03=16 04=22 05=02 06=e5 07=00 08=00 09=00
0a=00 0b=33 0c=44 0d=88 0e=88 0f=44 10=44 11=00 12=00 13=06 14=00 15=88
16=17 17=ad 18=00 19=8b 1a=40 1b=68 1c=03 1d=3f 1e=3f 1f=00 20=11 21=00
22=03 23=cc 25=24 26=4a 27=20 48=04 49=13 b2=28 b3=a3 words 00=ff2a
01=2a2a 02=2a16 03=1622 04=2202 05=02e5 06=e500 07=0000 spdmem0 at iic0
addr 0x50: 4GB DDR3 SDRAM PC3-12800 spdmem1 at iic0 addr 0x52: 4GB DDR3
SDRAM PC3-12800 isa0 at pcib0 isadma0 at isa0 com0 at isa0 port 0x3f8/8
irq 4: ns16550a, 16 byte fifo pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot) wskbd0 at pckbd0: console keyboard, using
wsdisplay0 pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: VMX/EPT
efifb at mainbus0 not configured
uhub3 at uhub0 port 4 configuration 1 interface 0 "Genesys Logic USB2.0
Hub" rev 2.00/32.98 addr 2 uhidev0 at uhub3 port 3 configuration 1
interface 0 "Dell Dell USB Keyboard" rev 1.10/3.06 addr 3 uhidev0:
iclass 3/1 ukbd0 at uhidev0: 8 variable keys, 6 key codes
wskbd1 at ukbd0 mux 1
wskbd1: connecting to wsdisplay0
uhidev1 at uhub3 port 4 configuration 1 interface 0 "Logitech G400s
Optical Gaming Mouse" rev 2.00/83.00 addr 4 uhidev1: iclass 3/1
ums0 at uhidev1: 8 buttons, Z dir
wsmouse0 at ums0 mux 0
uhidev2 at uhub3 port 4 configuration 1 interface 1 "Logitech G400s
Optical Gaming Mouse" rev 2.00/83.00 addr 4 uhidev2: iclass 3/0, 142
report ids uhid0 at uhidev2 reportid 32: input=0, output=0, feature=1
uhid1 at uhidev2 reportid 128: input=1, output=0, feature=0
uhid2 at uhidev2 reportid 142: input=0, output=0, feature=1
uaudio0 at uhub0 port 6 configuration 1 interface 0 "Griffin
Technology, Inc iMic USB audio system" rev 1.10/0.06 addr 5 uaudio0:
audio rev 1.00, 8 mixer controls audio1 at uaudio0
uhub4 at uhub1 port 1 configuration 1 interface 0 "Intel Rate Matching
Hub" rev 2.00/0.05 addr 2 uhub5 at uhub2 port 1 configuration 1
interface 0 "Intel Rate Matching Hub" rev 2.00/0.05 addr 2 vscsi0 at
root scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
sd1 at scsibus3 targ 1 lun 0: <OPENBSD, SR CRYPTO, 006> SCSI2 0/direct
fixed sd1: 1001561MB, 512 bytes/sector, 2051198753 sectors
root on sd1a (08d3c4078410030f.a) swap on sd1b dump on sd1b
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x01
audio1: failed to start playback
uaudio_chan_open: error creating pipe: err=INVAL endpt=0x84
audio1: failed to start recording
[PATCH] geo/josm 13878
Trivial update to josm r.13878 - works as usual on amd64.
A little note - after startup josm tells me this: "You are using version
'13878' of JOSM. The current stable snapshot is 13878 and 13878 is the
unstable development version."
So stable is unstable ;)
Regards
Holger
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/josm/Makefile,v
retrieving revision 1.42
diff -u -p -u -r1.42 Makefile
--- Makefile 13 Mar 2018 21:22:39 -0000 1.42
+++ Makefile 31 May 2018 20:30:49 -0000
@@ -2,7 +2,7 @@
COMMENT= OpenStreetMap map editor
-SVN_REV= 13500
+SVN_REV= 13878
DISTNAME= josm-snapshot-${SVN_REV}
EXTRACT_SUFX = .jar
EXTRACT_CASES+= *.jar) unzip -qa ${FULLDISTDIR}/$$archive -d ${WRKDIST};;
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/josm/distinfo,v
retrieving revision 1.26
diff -u -p -u -r1.26 distinfo
--- distinfo 13 Mar 2018 21:22:39 -0000 1.26
+++ distinfo 31 May 2018 20:30:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (josm-snapshot-13500.jar) = +8SaIbDAjyQUa/nF4QWa9PnLQNvHDXux/KqlgjzR3rc=
-SIZE (josm-snapshot-13500.jar) = 12797817
+SHA256 (josm-snapshot-13878.jar) = fW9Dc9hTRdcEJItD2H9DOgUYJdVbrvchVwh7mulfDDk=
+SIZE (josm-snapshot-13878.jar) = 13053351
A little note - after startup josm tells me this: "You are using version
'13878' of JOSM. The current stable snapshot is 13878 and 13878 is the
unstable development version."
So stable is unstable ;)
Regards
Holger
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/josm/Makefile,v
retrieving revision 1.42
diff -u -p -u -r1.42 Makefile
--- Makefile 13 Mar 2018 21:22:39 -0000 1.42
+++ Makefile 31 May 2018 20:30:49 -0000
@@ -2,7 +2,7 @@
COMMENT= OpenStreetMap map editor
-SVN_REV= 13500
+SVN_REV= 13878
DISTNAME= josm-snapshot-${SVN_REV}
EXTRACT_SUFX = .jar
EXTRACT_CASES+= *.jar) unzip -qa ${FULLDISTDIR}/$$archive -d ${WRKDIST};;
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/josm/distinfo,v
retrieving revision 1.26
diff -u -p -u -r1.26 distinfo
--- distinfo 13 Mar 2018 21:22:39 -0000 1.26
+++ distinfo 31 May 2018 20:30:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (josm-snapshot-13500.jar) = +8SaIbDAjyQUa/nF4QWa9PnLQNvHDXux/KqlgjzR3rc=
-SIZE (josm-snapshot-13500.jar) = 12797817
+SHA256 (josm-snapshot-13878.jar) = fW9Dc9hTRdcEJItD2H9DOgUYJdVbrvchVwh7mulfDDk=
+SIZE (josm-snapshot-13878.jar) = 13053351
Re: programs crash on Dell Latitude E7470
On 31 May 16:32 Stuart Henderson wrote:
> On 2018/05/31 17:24, Marco van Hulten wrote:
> > Stuart,
> >
> > On 31 May 15:10 Stuart Henderson wrote:
> > > The gdb output there doesn't include anything that will help track
> > > things down. At least a backtrace is needed ("bt" at the gdb
> > > prompt), but there will be more information included in the
> > > backtrace if you build from ports like this
> > >
> > > pkg_delete calcurse
> > > cd /usr/ports/productivity/calcurse
> > > make clean
> > > make DEBUG=-g repackage
> > > make install
> > >
> > > Since it's threaded you might get something more useful with
> > > "thread apply all bt full".
> >
> > I'll send that to them but so far have not recompiled it, because
> > of an issue with the source tree:
> >
> > marco@ultron:/usr/ports/productivity/calcurse$ make clean
> > Fatal: Unknown flavor(s) centered_tilde (in productivity/calcurse)
> > (No flavors for this port). (in productivity/calcurse)
> > *** Error 1 in /usr/ports/productivity/calcurse
> > (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
> >
> > I tried checking out a clean ports tree (download + cvs up), but it
> > resulted in the same error. Same for just the "make" command in any
> > port, for instance /usr/ports/mail/z-push/.
>
> Perhaps you have something setting this FLAVOR in /etc/mk.conf or the
> shell environment?
Yes, I had that set as a shell variable. I don't know why I ever put
that there.
Now I get other problems:
marco@ultron:/usr/ports/productivity/calcurse$ make
Fatal: Missing support for module x11/tk. (in lang/python/3.6)
Fatal: Missing support for module x11/tk. (in lang/python/3.6)
*** Error 1 in /usr/ports/lang/python/3.6 (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
Problem with dependency lang/python/3.6
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2057 '/usr/ports/pobj/calcurse-4.3.0/.dep-lang-python-3.6')
*** Error 1 in /usr/ports/productivity/calcurse (/usr/ports/infrastructure/mk/bsd.port.mk:2380 'all')
I have x11/tk and Python 3.6 installed.
I should've said I don't regularly build packages, but it shouldn't be
that hard :-)
Marco
> On 2018/05/31 17:24, Marco van Hulten wrote:
> > Stuart,
> >
> > On 31 May 15:10 Stuart Henderson wrote:
> > > The gdb output there doesn't include anything that will help track
> > > things down. At least a backtrace is needed ("bt" at the gdb
> > > prompt), but there will be more information included in the
> > > backtrace if you build from ports like this
> > >
> > > pkg_delete calcurse
> > > cd /usr/ports/productivity/calcurse
> > > make clean
> > > make DEBUG=-g repackage
> > > make install
> > >
> > > Since it's threaded you might get something more useful with
> > > "thread apply all bt full".
> >
> > I'll send that to them but so far have not recompiled it, because
> > of an issue with the source tree:
> >
> > marco@ultron:/usr/ports/productivity/calcurse$ make clean
> > Fatal: Unknown flavor(s) centered_tilde (in productivity/calcurse)
> > (No flavors for this port). (in productivity/calcurse)
> > *** Error 1 in /usr/ports/productivity/calcurse
> > (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
> >
> > I tried checking out a clean ports tree (download + cvs up), but it
> > resulted in the same error. Same for just the "make" command in any
> > port, for instance /usr/ports/mail/z-push/.
>
> Perhaps you have something setting this FLAVOR in /etc/mk.conf or the
> shell environment?
Yes, I had that set as a shell variable. I don't know why I ever put
that there.
Now I get other problems:
marco@ultron:/usr/ports/productivity/calcurse$ make
Fatal: Missing support for module x11/tk. (in lang/python/3.6)
Fatal: Missing support for module x11/tk. (in lang/python/3.6)
*** Error 1 in /usr/ports/lang/python/3.6 (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
Problem with dependency lang/python/3.6
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2057 '/usr/ports/pobj/calcurse-4.3.0/.dep-lang-python-3.6')
*** Error 1 in /usr/ports/productivity/calcurse (/usr/ports/infrastructure/mk/bsd.port.mk:2380 'all')
I have x11/tk and Python 3.6 installed.
I should've said I don't regularly build packages, but it shouldn't be
that hard :-)
Marco
Re: Programming for OpenBSD
Books related to OpenBSD: https://www.openbsd.org/books.html
If you're hacking the OpenBSD base, you'll get very good advice by
submitting patches to tech@.
You'll find that the OpenBSD community isn't overly fond of political
debate or security theater, most people just stick to technical
discussion.
If you're hacking the OpenBSD base, you'll get very good advice by
submitting patches to tech@.
You'll find that the OpenBSD community isn't overly fond of political
debate or security theater, most people just stick to technical
discussion.
Re: programs crash on Dell Latitude E7470
On 2018/05/31 17:24, Marco van Hulten wrote:
> Stuart,
>
> On 31 May 15:10 Stuart Henderson wrote:
> > The gdb output there doesn't include anything that will help track
> > things down. At least a backtrace is needed ("bt" at the gdb prompt),
> > but there will be more information included in the backtrace if you
> > build from ports like this
> >
> > pkg_delete calcurse
> > cd /usr/ports/productivity/calcurse
> > make clean
> > make DEBUG=-g repackage
> > make install
> >
> > Since it's threaded you might get something more useful with
> > "thread apply all bt full".
>
> I'll send that to them but so far have not recompiled it, because of an
> issue with the source tree:
>
> marco@ultron:/usr/ports/productivity/calcurse$ make clean
> Fatal: Unknown flavor(s) centered_tilde (in productivity/calcurse)
> (No flavors for this port). (in productivity/calcurse)
> *** Error 1 in /usr/ports/productivity/calcurse (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
>
> I tried checking out a clean ports tree (download + cvs up), but it
> resulted in the same error. Same for just the "make" command in any
> port, for instance /usr/ports/mail/z-push/.
Perhaps you have something setting this FLAVOR in /etc/mk.conf or the
shell environment?
> Stuart,
>
> On 31 May 15:10 Stuart Henderson wrote:
> > The gdb output there doesn't include anything that will help track
> > things down. At least a backtrace is needed ("bt" at the gdb prompt),
> > but there will be more information included in the backtrace if you
> > build from ports like this
> >
> > pkg_delete calcurse
> > cd /usr/ports/productivity/calcurse
> > make clean
> > make DEBUG=-g repackage
> > make install
> >
> > Since it's threaded you might get something more useful with
> > "thread apply all bt full".
>
> I'll send that to them but so far have not recompiled it, because of an
> issue with the source tree:
>
> marco@ultron:/usr/ports/productivity/calcurse$ make clean
> Fatal: Unknown flavor(s) centered_tilde (in productivity/calcurse)
> (No flavors for this port). (in productivity/calcurse)
> *** Error 1 in /usr/ports/productivity/calcurse (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
>
> I tried checking out a clean ports tree (download + cvs up), but it
> resulted in the same error. Same for just the "make" command in any
> port, for instance /usr/ports/mail/z-push/.
Perhaps you have something setting this FLAVOR in /etc/mk.conf or the
shell environment?
Re: programs crash on Dell Latitude E7470
Stuart,
On 31 May 15:10 Stuart Henderson wrote:
> The gdb output there doesn't include anything that will help track
> things down. At least a backtrace is needed ("bt" at the gdb prompt),
> but there will be more information included in the backtrace if you
> build from ports like this
>
> pkg_delete calcurse
> cd /usr/ports/productivity/calcurse
> make clean
> make DEBUG=-g repackage
> make install
>
> Since it's threaded you might get something more useful with
> "thread apply all bt full".
I'll send that to them but so far have not recompiled it, because of an
issue with the source tree:
marco@ultron:/usr/ports/productivity/calcurse$ make clean
Fatal: Unknown flavor(s) centered_tilde (in productivity/calcurse)
(No flavors for this port). (in productivity/calcurse)
*** Error 1 in /usr/ports/productivity/calcurse (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
I tried checking out a clean ports tree (download + cvs up), but it
resulted in the same error. Same for just the "make" command in any
port, for instance /usr/ports/mail/z-push/.
> Normally I'd suggest reporting to the port maintainer first
> (perhaps CC ports@openbsd.org) and see if they have an idea,
> but since it's already reported upstream it would be good to
> followup there with the backtrace as well.
Yes, that would have been better!
Marco
On 31 May 15:10 Stuart Henderson wrote:
> The gdb output there doesn't include anything that will help track
> things down. At least a backtrace is needed ("bt" at the gdb prompt),
> but there will be more information included in the backtrace if you
> build from ports like this
>
> pkg_delete calcurse
> cd /usr/ports/productivity/calcurse
> make clean
> make DEBUG=-g repackage
> make install
>
> Since it's threaded you might get something more useful with
> "thread apply all bt full".
I'll send that to them but so far have not recompiled it, because of an
issue with the source tree:
marco@ultron:/usr/ports/productivity/calcurse$ make clean
Fatal: Unknown flavor(s) centered_tilde (in productivity/calcurse)
(No flavors for this port). (in productivity/calcurse)
*** Error 1 in /usr/ports/productivity/calcurse (/usr/ports/infrastructure/mk/bsd.port.mk:3462 '.BEGIN': @exit 1)
I tried checking out a clean ports tree (download + cvs up), but it
resulted in the same error. Same for just the "make" command in any
port, for instance /usr/ports/mail/z-push/.
> Normally I'd suggest reporting to the port maintainer first
> (perhaps CC ports@openbsd.org) and see if they have an idea,
> but since it's already reported upstream it would be good to
> followup there with the backtrace as well.
Yes, that would have been better!
Marco
Re: UPDATE: emulators/stella 5.1.1 -> 5.1.2
On 05/31/18 10:21, Gonzalo L. Rodriguez wrote:
> On [30/05/18] [07:39P], Tom Murphy wrote:
>> Hi,
>>
>> Here is a diff for an update for emulators/stella to update it
>> from v5.1.1 to v5.1.2.
>>
>> Thanks,
>> Tom
>>
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/emulators/stella/Makefile,v
>> retrieving revision 1.29
>> diff -u -p -r1.29 Makefile
>> --- Makefile 14 Mar 2018 04:37:59 -0000 1.29
>> +++ Makefile 30 May 2018 19:32:14 -0000
>> @@ -2,11 +2,11 @@
>>
>> COMMENT = Atari 2600 VCS emulator
>>
>> -V = 5.1.1
>> +V = 5.1.2
>> DISTNAME = stella-$V
>> CATEGORIES = emulators
>> EXTRACT_SUFX = -src.tar.xz
>> -WRKDIST = ${WRKDIR}/${DISTNAME}-src
>> +WRKDIST = ${WRKDIR}/${DISTNAME}
>>
>> HOMEPAGE = https://stella-emu.github.io/
>>
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/emulators/stella/distinfo,v
>> retrieving revision 1.17
>> diff -u -p -r1.17 distinfo
>> --- distinfo 14 Mar 2018 04:37:59 -0000 1.17
>> +++ distinfo 30 May 2018 19:32:14 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (stella-5.1.1-src.tar.xz) =
>> PeathuTogdGiM5XDbFRT64oRYNDzoCGZL+mQoAmpM9o=
>> -SIZE (stella-5.1.1-src.tar.xz) = 1827240
>> +SHA256 (stella-5.1.2-src.tar.xz) =
>> d7IQ1Rr35L6IwUAU1Qfkg2e83/a4ulE3k/A18+MKIb0=
>> +SIZE (stella-5.1.2-src.tar.xz) = 1828112
>>
>
> OK gonzalo@
>
Committed, thanks !
> On [30/05/18] [07:39P], Tom Murphy wrote:
>> Hi,
>>
>> Here is a diff for an update for emulators/stella to update it
>> from v5.1.1 to v5.1.2.
>>
>> Thanks,
>> Tom
>>
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/emulators/stella/Makefile,v
>> retrieving revision 1.29
>> diff -u -p -r1.29 Makefile
>> --- Makefile 14 Mar 2018 04:37:59 -0000 1.29
>> +++ Makefile 30 May 2018 19:32:14 -0000
>> @@ -2,11 +2,11 @@
>>
>> COMMENT = Atari 2600 VCS emulator
>>
>> -V = 5.1.1
>> +V = 5.1.2
>> DISTNAME = stella-$V
>> CATEGORIES = emulators
>> EXTRACT_SUFX = -src.tar.xz
>> -WRKDIST = ${WRKDIR}/${DISTNAME}-src
>> +WRKDIST = ${WRKDIR}/${DISTNAME}
>>
>> HOMEPAGE = https://stella-emu.github.io/
>>
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/emulators/stella/distinfo,v
>> retrieving revision 1.17
>> diff -u -p -r1.17 distinfo
>> --- distinfo 14 Mar 2018 04:37:59 -0000 1.17
>> +++ distinfo 30 May 2018 19:32:14 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (stella-5.1.1-src.tar.xz) =
>> PeathuTogdGiM5XDbFRT64oRYNDzoCGZL+mQoAmpM9o=
>> -SIZE (stella-5.1.1-src.tar.xz) = 1827240
>> +SHA256 (stella-5.1.2-src.tar.xz) =
>> d7IQ1Rr35L6IwUAU1Qfkg2e83/a4ulE3k/A18+MKIb0=
>> +SIZE (stella-5.1.2-src.tar.xz) = 1828112
>>
>
> OK gonzalo@
>
Committed, thanks !
Re: programs crash on Dell Latitude E7470
On 2018/05/31 15:47, Marco van Hulten wrote:
> whereas calcurse stops in rthread.c, which I thought could be a
> calcurse bug so I reported it [1], but I'm not sure at all anymore.
>
> [1]: https://lists.calcurse.org/bugs/msg00261.html
The gdb output there doesn't include anything that will help track
things down. At least a backtrace is needed ("bt" at the gdb prompt),
but there will be more information included in the backtrace if you
build from ports like this
pkg_delete calcurse
cd /usr/ports/productivity/calcurse
make clean
make DEBUG=-g repackage
make install
Since it's threaded you might get something more useful with
"thread apply all bt full".
Normally I'd suggest reporting to the port maintainer first
(perhaps CC ports@openbsd.org) and see if they have an idea,
but since it's already reported upstream it would be good to
followup there with the backtrace as well.
> whereas calcurse stops in rthread.c, which I thought could be a
> calcurse bug so I reported it [1], but I'm not sure at all anymore.
>
> [1]: https://lists.calcurse.org/bugs/msg00261.html
The gdb output there doesn't include anything that will help track
things down. At least a backtrace is needed ("bt" at the gdb prompt),
but there will be more information included in the backtrace if you
build from ports like this
pkg_delete calcurse
cd /usr/ports/productivity/calcurse
make clean
make DEBUG=-g repackage
make install
Since it's threaded you might get something more useful with
"thread apply all bt full".
Normally I'd suggest reporting to the port maintainer first
(perhaps CC ports@openbsd.org) and see if they have an idea,
but since it's already reported upstream it would be good to
followup there with the backtrace as well.
[update] keyringer 0.5.3
From ed6e396465a551803b5dd3e2e3df33d979dda387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Jadi?= <gjadi@omecha.info>
Date: Thu, 31 May 2018 15:58:29 +0200
Subject: [PATCH] Update keyringer to 0.5.3
Most of the patches have been merged upstream.
---
security/keyringer/Makefile | 2 +-
security/keyringer/distinfo | 4 +-
security/keyringer/patches/patch-Makefile | 50 -------------------
.../patches/patch-lib_keyringer_actions_pwgen | 14 ------
.../patches/patch-lib_keyringer_functions | 57 +++-------------------
security/keyringer/pkg/PLIST | 2 +-
6 files changed, 12 insertions(+), 117 deletions(-)
delete mode 100644 security/keyringer/patches/patch-Makefile
delete mode 100644 security/keyringer/patches/patch-lib_keyringer_actions_pwgen
diff --git a/security/keyringer/Makefile b/security/keyringer/Makefile
index 7a77ddecb44..ad87672b2fe 100644
--- a/security/keyringer/Makefile
+++ b/security/keyringer/Makefile
@@ -2,7 +2,7 @@
COMMENT = manage and share secrets using GnuPG and Git
-DISTNAME = keyringer-0.5.2
+DISTNAME = keyringer-0.5.3
CATEGORIES = security
diff --git a/security/keyringer/distinfo b/security/keyringer/distinfo
index 57520b37829..000e9f3cd76 100644
--- a/security/keyringer/distinfo
+++ b/security/keyringer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keyringer-0.5.2.tar.bz2) = kiROVyUB98bKDEY2CPBngT7l5bIYRITrIezikU54oB4=
-SIZE (keyringer-0.5.2.tar.bz2) = 69869
+SHA256 (keyringer-0.5.3.tar.bz2) = ikpdp87ldzL9nXBWSZwAIKJi9r7N05cW24EXIucLerU=
+SIZE (keyringer-0.5.3.tar.bz2) = 78371
diff --git a/security/keyringer/patches/patch-Makefile b/security/keyringer/patches/patch-Makefile
deleted file mode 100644
index 15a07364bf3..00000000000
--- a/security/keyringer/patches/patch-Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -17,6 +17,7 @@
- PACKAGE = keyringer
- VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2)
- PREFIX ?= /usr/local
-+MANDIR ?=$(PREFIX)/share/man
- ARCHIVE ?= tarballs
- INSTALL = /usr/bin/install
-
-@@ -24,25 +25,25 @@ clean:
- find . -name *~ | xargs rm -f # clean local backups
-
- install_lib:
-- $(INSTALL) -D --mode=0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
-- $(INSTALL) -D --mode=0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-- $(INSTALL) -D --mode=0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-- $(INSTALL) -D --mode=0755 -d share/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-- $(INSTALL) -D --mode=0644 share/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-+ $(INSTALL) -D -m 0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
-+ $(INSTALL) -D -m 0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-+ $(INSTALL) -D -m 0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-+ $(INSTALL) -D -m 0755 -d share/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-+ $(INSTALL) -D -m 0644 share/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-
- install_bin:
-- $(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
-+ $(INSTALL) -D -m 0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
-
- install_doc:
-- $(INSTALL) -D --mode=0644 index.md $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README.md
-- $(INSTALL) -D --mode=0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE
-+ $(INSTALL) -D -m 0644 index.md $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README.md
-+ $(INSTALL) -D -m 0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE
-
- install_man:
-- $(INSTALL) -D --mode=0644 share/man/keyringer.1 $(DESTDIR)/$(PREFIX)/share/man/man1/keyringer.1
-+ $(INSTALL) -D -m 0644 share/man/keyringer.1 $(DESTDIR)/$(MANDIR)/man1/keyringer.1
-
- install_completion:
-- $(INSTALL) -D --mode=0644 lib/keyringer/completions/bash/keyringer $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/keyringer
-- $(INSTALL) -D --mode=0644 lib/keyringer/completions/zsh/_keyringer $(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions/_keyringer
-+ $(INSTALL) -D -m 0644 lib/keyringer/completions/bash/keyringer $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/keyringer
-+ $(INSTALL) -D -m 0644 lib/keyringer/completions/zsh/_keyringer $(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions/_keyringer
-
- install: clean
- @make install_lib install_bin install_doc install_man install_completion
diff --git a/security/keyringer/patches/patch-lib_keyringer_actions_pwgen b/security/keyringer/patches/patch-lib_keyringer_actions_pwgen
deleted file mode 100644
index 8b7c0804c95..00000000000
--- a/security/keyringer/patches/patch-lib_keyringer_actions_pwgen
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_keyringer_actions_pwgen,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
-
-Index: lib/keyringer/actions/pwgen
---- lib/keyringer/actions/pwgen.orig
-+++ lib/keyringer/actions/pwgen
-@@ -18,7 +18,7 @@ function keyringer_pwgen {
-
- # Strip possible newlines if output is wrapped.
- # Also strip trailing = signs as they add nothing to the password's entropy.
-- head -c $ENTROPY_BYTES $ENTROPY_SOURCE | base64 | tr -d '\n='
-+ dd bs=1 count=$ENTROPY_BYTES if=$ENTROPY_SOURCE | base64 | tr -d '\n='
- echo
- }
-
diff --git a/security/keyringer/patches/patch-lib_keyringer_functions b/security/keyringer/patches/patch-lib_keyringer_functions
index bc3034034dd..18b5b1fbc36 100644
--- a/security/keyringer/patches/patch-lib_keyringer_functions
+++ b/security/keyringer/patches/patch-lib_keyringer_functions
@@ -1,9 +1,6 @@
$OpenBSD: patch-lib_keyringer_functions,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
- no mount -l/tmpfs in OpenBSD
-- fix mktemp(1) template
-- use rm -P to delete secret files (or gshred if available)
-- cleanup empty directories when wiping
- use gpg2, upstream seems to rely on gpg being gpg2
Index: lib/keyringer/functions
@@ -14,49 +11,11 @@ Index: lib/keyringer/functions
# Ramdisk check
mount="`df "$path" | sed -n '$p' | awk '{ print $NF }'`"
- mount -l -t tmpfs | awk '{ print $3 }' | grep -q -e "^$mount$"
-+ mount -t mfs | awk '{ print $3 }' | grep -q -e "^$mount$"
++ mount -t mpfs | awk '{ print $3 }' | grep -q -e "^$mount$"
}
# Setup a temporary file
-@@ -161,7 +161,7 @@ function keyringer_set_tmpfile {
- if [ -z "$1" ]; then
- template="$tmp/keyringer.XXXXXXXXXX"
- else
-- template="$tmp/XXXXXXXXXX.$1"
-+ template="$tmp/keyringer.$1.XXXXXXXXXX"
- fi
-
- mkdir -p "$tmp"
-@@ -197,6 +197,10 @@ function keyringer_shred {
- tool="wipe"
- elif which shred &> /dev/null; then
- tool="shred"
-+ elif which gshred &> /dev/null; then
-+ tool="gshred"
-+ elif _F=$(mktemp); rm -P "${_F}" &> /dev/null; then
-+ tool="rm -P"
- else
- # Worst implementation
- message="WARNING $message"
-@@ -206,13 +210,14 @@ function keyringer_shred {
- echo "$message $path using $tool..."
-
- if [ -d "$path" ]; then
-- if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ]; then
-+ if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ] || [ "$tool" == "rm -P" ]; then
- $tool -rf $path
- else
-- find $path -exec $tool -uf {} \;
-+ find $path -type f -exec $tool -uf {} \;
-+ find -d $path -type d -exec rmdir {} \;
- fi
- else
-- if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ]; then
-+ if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ] || [ "$tool" == "rm -P" ]; then
- $tool -f "$path"
- else
- $tool -uf "$path"
-@@ -305,9 +310,9 @@ function keyringer_set_env {
+@@ -314,9 +314,9 @@ function keyringer_set_env {
fi
if [ ! -z "$KEYID" ]; then
@@ -68,7 +27,7 @@ Index: lib/keyringer/functions
fi
# Check keyring config version
-@@ -592,7 +597,7 @@ function keyringer_recv_keys {
+@@ -601,7 +601,7 @@ function keyringer_recv_keys {
local recipient="$1"
echo "Trying to receive missing key $recipient..."
@@ -77,7 +36,7 @@ Index: lib/keyringer/functions
}
# Refresh keys from keyserver
-@@ -602,7 +607,7 @@ function keyringer_refresh_keys {
+@@ -611,7 +611,7 @@ function keyringer_refresh_keys {
local recipient="$1"
echo "Trying to refresh key $recipient..."
@@ -86,7 +45,7 @@ Index: lib/keyringer/functions
}
# Check recipient size
-@@ -689,7 +694,7 @@ function keyringer_check_recipients {
+@@ -698,7 +698,7 @@ function keyringer_check_recipients {
function keyringer_check_recipient_key {
local recipient="$1"
@@ -95,7 +54,7 @@ Index: lib/keyringer/functions
if [ "$?" != "0" ]; then
if [ "$BASENAME" == "check" ]; then
refresh="no"
-@@ -718,7 +723,7 @@ function keyringer_check_expiration {
+@@ -727,7 +727,7 @@ function keyringer_check_expiration {
seconds="`date +%s`"
# Check the main key
@@ -104,7 +63,7 @@ Index: lib/keyringer/functions
# TODO: Time to expire can be configured via repository options.
ahead="$((86400 * 30 + $seconds))"
-@@ -745,7 +750,7 @@ function keyringer_check_expiration {
+@@ -754,7 +754,7 @@ function keyringer_check_expiration {
# Check the subkeys
local subkey=""
@@ -113,7 +72,7 @@ Index: lib/keyringer/functions
local expiry=$(cut -d : -f 7 <<< "$subkey")
if [[ -z "$expiry" ]]; then
-@@ -842,7 +847,7 @@ function keyringer_create_new_recipients {
+@@ -851,7 +851,7 @@ function keyringer_create_new_recipients {
recipient="`grep -e "^default-key" ~/.gnupg/gpg.conf | cut -d ' ' -f 2`"
if [ ! -z "$recipient" ]; then
diff --git a/security/keyringer/pkg/PLIST b/security/keyringer/pkg/PLIST
index 873af8c0ee8..54dae5a0467 100644
--- a/security/keyringer/pkg/PLIST
+++ b/security/keyringer/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
+@comment $OpenBSD: PLIST,v$
bin/keyringer
lib/keyringer/
lib/keyringer/actions/
--
2.16.2
Hello,
Here is a diff to update keyringer to 0.5.3. Most of the patches have
been merged upstream. The only patches left are:
- no mount -l/-t tmpfs on OpenBSD
- force the use of gpg2
I've checked the GPG signature of the package, though I haven't signed
the key of the maintainer, I've been mailing with him.
Best,
From: =?UTF-8?q?Gr=C3=A9goire=20Jadi?= <gjadi@omecha.info>
Date: Thu, 31 May 2018 15:58:29 +0200
Subject: [PATCH] Update keyringer to 0.5.3
Most of the patches have been merged upstream.
---
security/keyringer/Makefile | 2 +-
security/keyringer/distinfo | 4 +-
security/keyringer/patches/patch-Makefile | 50 -------------------
.../patches/patch-lib_keyringer_actions_pwgen | 14 ------
.../patches/patch-lib_keyringer_functions | 57 +++-------------------
security/keyringer/pkg/PLIST | 2 +-
6 files changed, 12 insertions(+), 117 deletions(-)
delete mode 100644 security/keyringer/patches/patch-Makefile
delete mode 100644 security/keyringer/patches/patch-lib_keyringer_actions_pwgen
diff --git a/security/keyringer/Makefile b/security/keyringer/Makefile
index 7a77ddecb44..ad87672b2fe 100644
--- a/security/keyringer/Makefile
+++ b/security/keyringer/Makefile
@@ -2,7 +2,7 @@
COMMENT = manage and share secrets using GnuPG and Git
-DISTNAME = keyringer-0.5.2
+DISTNAME = keyringer-0.5.3
CATEGORIES = security
diff --git a/security/keyringer/distinfo b/security/keyringer/distinfo
index 57520b37829..000e9f3cd76 100644
--- a/security/keyringer/distinfo
+++ b/security/keyringer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keyringer-0.5.2.tar.bz2) = kiROVyUB98bKDEY2CPBngT7l5bIYRITrIezikU54oB4=
-SIZE (keyringer-0.5.2.tar.bz2) = 69869
+SHA256 (keyringer-0.5.3.tar.bz2) = ikpdp87ldzL9nXBWSZwAIKJi9r7N05cW24EXIucLerU=
+SIZE (keyringer-0.5.3.tar.bz2) = 78371
diff --git a/security/keyringer/patches/patch-Makefile b/security/keyringer/patches/patch-Makefile
deleted file mode 100644
index 15a07364bf3..00000000000
--- a/security/keyringer/patches/patch-Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -17,6 +17,7 @@
- PACKAGE = keyringer
- VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2)
- PREFIX ?= /usr/local
-+MANDIR ?=$(PREFIX)/share/man
- ARCHIVE ?= tarballs
- INSTALL = /usr/bin/install
-
-@@ -24,25 +25,25 @@ clean:
- find . -name *~ | xargs rm -f # clean local backups
-
- install_lib:
-- $(INSTALL) -D --mode=0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
-- $(INSTALL) -D --mode=0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-- $(INSTALL) -D --mode=0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-- $(INSTALL) -D --mode=0755 -d share/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-- $(INSTALL) -D --mode=0644 share/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-+ $(INSTALL) -D -m 0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
-+ $(INSTALL) -D -m 0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-+ $(INSTALL) -D -m 0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
-+ $(INSTALL) -D -m 0755 -d share/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-+ $(INSTALL) -D -m 0644 share/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors
-
- install_bin:
-- $(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
-+ $(INSTALL) -D -m 0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
-
- install_doc:
-- $(INSTALL) -D --mode=0644 index.md $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README.md
-- $(INSTALL) -D --mode=0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE
-+ $(INSTALL) -D -m 0644 index.md $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README.md
-+ $(INSTALL) -D -m 0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE
-
- install_man:
-- $(INSTALL) -D --mode=0644 share/man/keyringer.1 $(DESTDIR)/$(PREFIX)/share/man/man1/keyringer.1
-+ $(INSTALL) -D -m 0644 share/man/keyringer.1 $(DESTDIR)/$(MANDIR)/man1/keyringer.1
-
- install_completion:
-- $(INSTALL) -D --mode=0644 lib/keyringer/completions/bash/keyringer $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/keyringer
-- $(INSTALL) -D --mode=0644 lib/keyringer/completions/zsh/_keyringer $(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions/_keyringer
-+ $(INSTALL) -D -m 0644 lib/keyringer/completions/bash/keyringer $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/keyringer
-+ $(INSTALL) -D -m 0644 lib/keyringer/completions/zsh/_keyringer $(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions/_keyringer
-
- install: clean
- @make install_lib install_bin install_doc install_man install_completion
diff --git a/security/keyringer/patches/patch-lib_keyringer_actions_pwgen b/security/keyringer/patches/patch-lib_keyringer_actions_pwgen
deleted file mode 100644
index 8b7c0804c95..00000000000
--- a/security/keyringer/patches/patch-lib_keyringer_actions_pwgen
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_keyringer_actions_pwgen,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
-
-Index: lib/keyringer/actions/pwgen
---- lib/keyringer/actions/pwgen.orig
-+++ lib/keyringer/actions/pwgen
-@@ -18,7 +18,7 @@ function keyringer_pwgen {
-
- # Strip possible newlines if output is wrapped.
- # Also strip trailing = signs as they add nothing to the password's entropy.
-- head -c $ENTROPY_BYTES $ENTROPY_SOURCE | base64 | tr -d '\n='
-+ dd bs=1 count=$ENTROPY_BYTES if=$ENTROPY_SOURCE | base64 | tr -d '\n='
- echo
- }
-
diff --git a/security/keyringer/patches/patch-lib_keyringer_functions b/security/keyringer/patches/patch-lib_keyringer_functions
index bc3034034dd..18b5b1fbc36 100644
--- a/security/keyringer/patches/patch-lib_keyringer_functions
+++ b/security/keyringer/patches/patch-lib_keyringer_functions
@@ -1,9 +1,6 @@
$OpenBSD: patch-lib_keyringer_functions,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
- no mount -l/tmpfs in OpenBSD
-- fix mktemp(1) template
-- use rm -P to delete secret files (or gshred if available)
-- cleanup empty directories when wiping
- use gpg2, upstream seems to rely on gpg being gpg2
Index: lib/keyringer/functions
@@ -14,49 +11,11 @@ Index: lib/keyringer/functions
# Ramdisk check
mount="`df "$path" | sed -n '$p' | awk '{ print $NF }'`"
- mount -l -t tmpfs | awk '{ print $3 }' | grep -q -e "^$mount$"
-+ mount -t mfs | awk '{ print $3 }' | grep -q -e "^$mount$"
++ mount -t mpfs | awk '{ print $3 }' | grep -q -e "^$mount$"
}
# Setup a temporary file
-@@ -161,7 +161,7 @@ function keyringer_set_tmpfile {
- if [ -z "$1" ]; then
- template="$tmp/keyringer.XXXXXXXXXX"
- else
-- template="$tmp/XXXXXXXXXX.$1"
-+ template="$tmp/keyringer.$1.XXXXXXXXXX"
- fi
-
- mkdir -p "$tmp"
-@@ -197,6 +197,10 @@ function keyringer_shred {
- tool="wipe"
- elif which shred &> /dev/null; then
- tool="shred"
-+ elif which gshred &> /dev/null; then
-+ tool="gshred"
-+ elif _F=$(mktemp); rm -P "${_F}" &> /dev/null; then
-+ tool="rm -P"
- else
- # Worst implementation
- message="WARNING $message"
-@@ -206,13 +210,14 @@ function keyringer_shred {
- echo "$message $path using $tool..."
-
- if [ -d "$path" ]; then
-- if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ]; then
-+ if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ] || [ "$tool" == "rm -P" ]; then
- $tool -rf $path
- else
-- find $path -exec $tool -uf {} \;
-+ find $path -type f -exec $tool -uf {} \;
-+ find -d $path -type d -exec rmdir {} \;
- fi
- else
-- if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ]; then
-+ if [ "$tool" == "wipe" ] || [ "$tool" == "rm" ] || [ "$tool" == "rm -P" ]; then
- $tool -f "$path"
- else
- $tool -uf "$path"
-@@ -305,9 +310,9 @@ function keyringer_set_env {
+@@ -314,9 +314,9 @@ function keyringer_set_env {
fi
if [ ! -z "$KEYID" ]; then
@@ -68,7 +27,7 @@ Index: lib/keyringer/functions
fi
# Check keyring config version
-@@ -592,7 +597,7 @@ function keyringer_recv_keys {
+@@ -601,7 +601,7 @@ function keyringer_recv_keys {
local recipient="$1"
echo "Trying to receive missing key $recipient..."
@@ -77,7 +36,7 @@ Index: lib/keyringer/functions
}
# Refresh keys from keyserver
-@@ -602,7 +607,7 @@ function keyringer_refresh_keys {
+@@ -611,7 +611,7 @@ function keyringer_refresh_keys {
local recipient="$1"
echo "Trying to refresh key $recipient..."
@@ -86,7 +45,7 @@ Index: lib/keyringer/functions
}
# Check recipient size
-@@ -689,7 +694,7 @@ function keyringer_check_recipients {
+@@ -698,7 +698,7 @@ function keyringer_check_recipients {
function keyringer_check_recipient_key {
local recipient="$1"
@@ -95,7 +54,7 @@ Index: lib/keyringer/functions
if [ "$?" != "0" ]; then
if [ "$BASENAME" == "check" ]; then
refresh="no"
-@@ -718,7 +723,7 @@ function keyringer_check_expiration {
+@@ -727,7 +727,7 @@ function keyringer_check_expiration {
seconds="`date +%s`"
# Check the main key
@@ -104,7 +63,7 @@ Index: lib/keyringer/functions
# TODO: Time to expire can be configured via repository options.
ahead="$((86400 * 30 + $seconds))"
-@@ -745,7 +750,7 @@ function keyringer_check_expiration {
+@@ -754,7 +754,7 @@ function keyringer_check_expiration {
# Check the subkeys
local subkey=""
@@ -113,7 +72,7 @@ Index: lib/keyringer/functions
local expiry=$(cut -d : -f 7 <<< "$subkey")
if [[ -z "$expiry" ]]; then
-@@ -842,7 +847,7 @@ function keyringer_create_new_recipients {
+@@ -851,7 +851,7 @@ function keyringer_create_new_recipients {
recipient="`grep -e "^default-key" ~/.gnupg/gpg.conf | cut -d ' ' -f 2`"
if [ ! -z "$recipient" ]; then
diff --git a/security/keyringer/pkg/PLIST b/security/keyringer/pkg/PLIST
index 873af8c0ee8..54dae5a0467 100644
--- a/security/keyringer/pkg/PLIST
+++ b/security/keyringer/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/24 10:01:24 jca Exp $
+@comment $OpenBSD: PLIST,v$
bin/keyringer
lib/keyringer/
lib/keyringer/actions/
--
2.16.2
Hello,
Here is a diff to update keyringer to 0.5.3. Most of the patches have
been merged upstream. The only patches left are:
- no mount -l/-t tmpfs on OpenBSD
- force the use of gpg2
I've checked the GPG signature of the package, though I haven't signed
the key of the maintainer, I've been mailing with him.
Best,
Re: PHP removal of old patches
On 2018/05/31 12:40, Martijn van Duren wrote:
> patch-ext_gd_gdcache_h:
> malloc.h is removed
OK. doesn't need a bump.
> patch-ext_sockets_sockaddr_conv_c:
> proper HAVE_AI_V4MAPPED check
OK.
> patch-main_php_open_temporary_file_c:
> Worth the patch for mkstemp? Note that by examining the binary there's
> also other places where we don't add the extra Xs.
OK.
> patch-sapi_cli_php_cli_c:
> adds unneeded char *ini
looks like this patch lost some pieces, they went astray between 5.3 and 5.4
c.f. patch-sapi_apache_mod_php5_c, patch-sapi_cgi_cgi_main_c
will try to look at the rest some other time.
> patch-acinclude_m4:
> 1st section: Doesn't seem to do anything (I might have missed something)
> 2nd section: Doesn't seem logical to disable an enabled check
> 3rd section: PHP_OPENSSL is set lines before
>
> patch-ext_gd_libgd_gdkanji_c, patch-ext_iconv_iconv_c,
> patch-ext_xmlrpc_libxmlrpc_encodings_c:
> convert to const seems useless
>
> patch-ext_mysqlnd_config9_m4:
> mysqlnd is enabled via configure
>
> patch-ext_openssl_config0_m4:
> libssl already links to libcrypto. Also the check is not there in 7.0.
>
>
> patch-ext_spl_php_spl_c, patch-ext_spl_php_spl_h:
> pointer type doesn't seem to matter
>
> patch-main_php_h:
> proper HAVE_SOCKLEN_T check
>
>
> martijn@
>
> Index: 5.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.72
> diff -u -p -r1.72 Makefile
> --- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
> +++ 5.6/Makefile 31 May 2018 10:38:43 -0000
> @@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
>
> PV= 5.6
> V= ${PV}.36
> -REVISION= 4
> +REVISION= 5
>
> MASTER_SITES0= https://download.suhosin.org/
>
> Index: 5.6/patches/patch-ext_gd_gdcache_h
> ===================================================================
> RCS file: 5.6/patches/patch-ext_gd_gdcache_h
> diff -N 5.6/patches/patch-ext_gd_gdcache_h
> --- 5.6/patches/patch-ext_gd_gdcache_h 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-ext_gd_gdcache_h,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/gd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
> -+++ ext/gd/gdcache.h Sat Jun 18 12:14:48 2011
> -@@ -41,6 +41,7 @@
> - /*********************************************************/
> -
> - #if (!defined(_OSD_POSIX) && !defined(__FreeBSD__)) && HAVE_MALLOC_H
> -+#elif !defined(__OpenBSD__)
/php_c> - #include <malloc.h>
> - #else
> - #include <stdlib.h> /* BS2000/OSD defines malloc() & friends in stdlib.h */
> Index: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
> ===================================================================
> RCS file: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
> diff -N 5.6/patches/patch-ext_gd_libgd_gdkanji_c
> --- 5.6/patches/patch-ext_gd_libgd_gdkanji_c 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
> -+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
> -@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
> - from_len = strlen ((const char *) from) + 1;
> - to_len = BUFSIZ;
> -
> -- if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1)
> -+ if ((int) iconv(cd, (const char **) &from, &from_len, (char **) &to, &to_len) == -1)
> - {
> - #ifdef HAVE_ERRNO_H
> - if (errno == EINVAL)
> Index: 5.6/patches/patch-ext_iconv_iconv_c
> ===================================================================
> RCS file: 5.6/patches/patch-ext_iconv_iconv_c
> diff -N 5.6/patches/patch-ext_iconv_iconv_c
> --- 5.6/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:06:23 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,75 +0,0 @@
> -$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:06:23 robert Exp $
> ---- ext/iconv/iconv.c.orig.port Fri Jul 10 02:33:32 2015
> -+++ ext/iconv/iconv.c Sun Jul 12 16:05:11 2015
> -@@ -463,7 +463,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
> -
> - out_p = (d)->c + (d)->len;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EINVAL:
> -@@ -650,7 +650,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
> - out_p = out_buf;
> -
> - while (in_left > 0) {
> -- result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
> -+ result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
> - out_size = bsz - out_left;
> - if (result == (size_t)(-1)) {
> - if (ignore_ilseq && errno == EILSEQ) {
> -@@ -775,7 +775,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
> -
> - prev_in_left = in_left;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - if (prev_in_left == in_left) {
> - break;
> - }
> -@@ -896,7 +896,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr
> -
> - prev_in_left = in_left;
> -
> -- if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd1, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - if (prev_in_left == in_left) {
> - break;
> - }
> -@@ -1028,7 +1028,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
> -
> - prev_in_left = in_left;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - if (prev_in_left == in_left) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> -@@ -1277,7 +1277,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
> -
> - out_left = out_size - out_reserved;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EINVAL:
> -@@ -1377,7 +1377,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
> - out_p = buf;
> - out_left = out_size;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EINVAL:
> -@@ -2650,7 +2650,7 @@ static int php_iconv_stream_filter_append_bucket(
> - tcnt = self->stub_len;
> -
> - while (tcnt > 0) {
> -- if (iconv(self->cd, &pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
> -+ if (iconv(self->cd, (const char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EILSEQ:
> Index: 5.6/patches/patch-ext_mysqlnd_config9_m4
> ===================================================================
> RCS file: 5.6/patches/patch-ext_mysqlnd_config9_m4
> diff -N 5.6/patches/patch-ext_mysqlnd_config9_m4
> --- 5.6/patches/patch-ext_mysqlnd_config9_m4 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/mysqlnd/config9.m4.orig.port Wed Jul 3 08:10:53 2013
> -+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
> -@@ -16,6 +16,7 @@ if test -z "$PHP_ZLIB_DIR"; then
> - fi
> -
> - dnl If some extension uses mysqlnd it will get compiled in PHP core
> -+PHP_MYSQLND_ENABLED="yes"
> - if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
> - mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
> - mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
> Index: 5.6/patches/patch-ext_openssl_config0_m4
> ===================================================================
> RCS file: 5.6/patches/patch-ext_openssl_config0_m4
> diff -N 5.6/patches/patch-ext_openssl_config0_m4
> --- 5.6/patches/patch-ext_openssl_config0_m4 25 May 2018 13:59:19 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-ext_openssl_config0_m4,v 1.3 2018/05/25 13:59:19 sthen Exp $
> ---- ext/openssl/config0.m4.orig.port Wed Apr 15 20:05:57 2015
> -+++ ext/openssl/config0.m4 Sat Apr 25 18:10:11 2015
> -@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
> - PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
> - fi
> -
> -- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
> -+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
> - AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
> - AC_CHECK_FUNCS([RAND_egd])
> -
> Index: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
> ===================================================================
> RCS file: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
> diff -N 5.6/patches/patch-ext_sockets_sockaddr_conv_c
> --- 5.6/patches/patch-ext_sockets_sockaddr_conv_c 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar 5 10:18:00 2014
> -+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
> -@@ -11,6 +11,10 @@
> -
> - extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
> -
> -+#if defined(__OpenBSD__)
> -+#define AI_V4MAPPED 0
> -+
> patch-ext_gd_gdcache_h:
> malloc.h is removed
OK. doesn't need a bump.
> patch-ext_sockets_sockaddr_conv_c:
> proper HAVE_AI_V4MAPPED check
OK.
> patch-main_php_open_temporary_file_c:
> Worth the patch for mkstemp? Note that by examining the binary there's
> also other places where we don't add the extra Xs.
OK.
> patch-sapi_cli_php_cli_c:
> adds unneeded char *ini
looks like this patch lost some pieces, they went astray between 5.3 and 5.4
c.f. patch-sapi_apache_mod_php5_c, patch-sapi_cgi_cgi_main_c
will try to look at the rest some other time.
> patch-acinclude_m4:
> 1st section: Doesn't seem to do anything (I might have missed something)
> 2nd section: Doesn't seem logical to disable an enabled check
> 3rd section: PHP_OPENSSL is set lines before
>
> patch-ext_gd_libgd_gdkanji_c, patch-ext_iconv_iconv_c,
> patch-ext_xmlrpc_libxmlrpc_encodings_c:
> convert to const seems useless
>
> patch-ext_mysqlnd_config9_m4:
> mysqlnd is enabled via configure
>
> patch-ext_openssl_config0_m4:
> libssl already links to libcrypto. Also the check is not there in 7.0.
>
>
> patch-ext_spl_php_spl_c, patch-ext_spl_php_spl_h:
> pointer type doesn't seem to matter
>
> patch-main_php_h:
> proper HAVE_SOCKLEN_T check
>
>
> martijn@
>
> Index: 5.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.72
> diff -u -p -r1.72 Makefile
> --- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
> +++ 5.6/Makefile 31 May 2018 10:38:43 -0000
> @@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
>
> PV= 5.6
> V= ${PV}.36
> -REVISION= 4
> +REVISION= 5
>
> MASTER_SITES0= https://download.suhosin.org/
>
> Index: 5.6/patches/patch-ext_gd_gdcache_h
> ===================================================================
> RCS file: 5.6/patches/patch-ext_gd_gdcache_h
> diff -N 5.6/patches/patch-ext_gd_gdcache_h
> --- 5.6/patches/patch-ext_gd_gdcache_h 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-ext_gd_gdcache_h,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/gd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
> -+++ ext/gd/gdcache.h Sat Jun 18 12:14:48 2011
> -@@ -41,6 +41,7 @@
> - /*********************************************************/
> -
> - #if (!defined(_OSD_POSIX) && !defined(__FreeBSD__)) && HAVE_MALLOC_H
> -+#elif !defined(__OpenBSD__)
/php_c> - #include <malloc.h>
> - #else
> - #include <stdlib.h> /* BS2000/OSD defines malloc() & friends in stdlib.h */
> Index: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
> ===================================================================
> RCS file: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
> diff -N 5.6/patches/patch-ext_gd_libgd_gdkanji_c
> --- 5.6/patches/patch-ext_gd_libgd_gdkanji_c 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
> -+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
> -@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
> - from_len = strlen ((const char *) from) + 1;
> - to_len = BUFSIZ;
> -
> -- if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1)
> -+ if ((int) iconv(cd, (const char **) &from, &from_len, (char **) &to, &to_len) == -1)
> - {
> - #ifdef HAVE_ERRNO_H
> - if (errno == EINVAL)
> Index: 5.6/patches/patch-ext_iconv_iconv_c
> ===================================================================
> RCS file: 5.6/patches/patch-ext_iconv_iconv_c
> diff -N 5.6/patches/patch-ext_iconv_iconv_c
> --- 5.6/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:06:23 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,75 +0,0 @@
> -$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:06:23 robert Exp $
> ---- ext/iconv/iconv.c.orig.port Fri Jul 10 02:33:32 2015
> -+++ ext/iconv/iconv.c Sun Jul 12 16:05:11 2015
> -@@ -463,7 +463,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
> -
> - out_p = (d)->c + (d)->len;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EINVAL:
> -@@ -650,7 +650,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
> - out_p = out_buf;
> -
> - while (in_left > 0) {
> -- result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
> -+ result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
> - out_size = bsz - out_left;
> - if (result == (size_t)(-1)) {
> - if (ignore_ilseq && errno == EILSEQ) {
> -@@ -775,7 +775,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
> -
> - prev_in_left = in_left;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - if (prev_in_left == in_left) {
> - break;
> - }
> -@@ -896,7 +896,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr
> -
> - prev_in_left = in_left;
> -
> -- if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd1, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - if (prev_in_left == in_left) {
> - break;
> - }
> -@@ -1028,7 +1028,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
> -
> - prev_in_left = in_left;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - if (prev_in_left == in_left) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> -@@ -1277,7 +1277,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
> -
> - out_left = out_size - out_reserved;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EINVAL:
> -@@ -1377,7 +1377,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
> - out_p = buf;
> - out_left = out_size;
> -
> -- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> -+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EINVAL:
> -@@ -2650,7 +2650,7 @@ static int php_iconv_stream_filter_append_bucket(
> - tcnt = self->stub_len;
> -
> - while (tcnt > 0) {
> -- if (iconv(self->cd, &pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
> -+ if (iconv(self->cd, (const char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
> - #if ICONV_SUPPORTS_ERRNO
> - switch (errno) {
> - case EILSEQ:
> Index: 5.6/patches/patch-ext_mysqlnd_config9_m4
> ===================================================================
> RCS file: 5.6/patches/patch-ext_mysqlnd_config9_m4
> diff -N 5.6/patches/patch-ext_mysqlnd_config9_m4
> --- 5.6/patches/patch-ext_mysqlnd_config9_m4 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/mysqlnd/config9.m4.orig.port Wed Jul 3 08:10:53 2013
> -+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
> -@@ -16,6 +16,7 @@ if test -z "$PHP_ZLIB_DIR"; then
> - fi
> -
> - dnl If some extension uses mysqlnd it will get compiled in PHP core
> -+PHP_MYSQLND_ENABLED="yes"
> - if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
> - mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
> - mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
> Index: 5.6/patches/patch-ext_openssl_config0_m4
> ===================================================================
> RCS file: 5.6/patches/patch-ext_openssl_config0_m4
> diff -N 5.6/patches/patch-ext_openssl_config0_m4
> --- 5.6/patches/patch-ext_openssl_config0_m4 25 May 2018 13:59:19 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-ext_openssl_config0_m4,v 1.3 2018/05/25 13:59:19 sthen Exp $
> ---- ext/openssl/config0.m4.orig.port Wed Apr 15 20:05:57 2015
> -+++ ext/openssl/config0.m4 Sat Apr 25 18:10:11 2015
> -@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
> - PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
> - fi
> -
> -- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
> -+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
> - AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
> - AC_CHECK_FUNCS([RAND_egd])
> -
> Index: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
> ===================================================================
> RCS file: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
> diff -N 5.6/patches/patch-ext_sockets_sockaddr_conv_c
> --- 5.6/patches/patch-ext_sockets_sockaddr_conv_c 15 Nov 2014 13:43:01 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar 5 10:18:00 2014
> -+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
> -@@ -11,6 +11,10 @@
> -
> - extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
> -
> -+#if defined(__OpenBSD__)
> -+#define AI_V4MAPPED 0
> -+
Re: programs crash on Dell Latitude E7470
On 31 May 10:15 Stuart Henderson wrote:
> On 2018/05/31 10:06, Marco van Hulten wrote:
> > Stuart,
> >
> > [...]
> >
> > I now see there are some limits [...] as normal user
> > [now given from ksh(1)]
$ ulimit -a
time(cpu-seconds) unlimited
file(blocks) unlimited
coredump(blocks) unlimited
data(kbytes) 786432
stack(kbytes) 4096
lockedmem(kbytes) 5303878
memory(kbytes) 15888396
nofiles(descriptors) 512
processes 128
I put myself in login class "staff", which increased limits, and then
increased limits a bit further where I could:
$ ulimit -a
time(cpu-seconds) unlimited
file(blocks) unlimited
coredump(blocks) unlimited
data(kbytes) 15728640
stack(kbytes) 4096
lockedmem(kbytes) 5503878
memory(kbytes) 15888396
nofiles(descriptors) 1024
processes 512
From this shell I started abiword, and get an immediate crash:
$ rm -rf ~/.config/abiword
$ abiword
Abort trap (core dumped)
$ gdb abiword abiword.core
[...]
Loaded symbols for /usr/local/lib/abiword-3.0/plugins/pdf.so
#0 thrkill () at -:3
3 -: No such file or directory.
in -
(gdb)
whereas calcurse stops in rthread.c, which I thought could be a
calcurse bug so I reported it [1], but I'm not sure at all anymore.
[1]: https://lists.calcurse.org/bugs/msg00261.html
Two days or so ago Firefox and Claws Mail crashed at arbitrary
moments. Just maybe this behaviour will stop now.
> Limits are grouped by login class (5th field in master.passwd). root
> is usually in "daemon" and the initial user created during install is
> in "staff" (default 1.5GB for datasize-cur, no limit for
> datasize-max). Users that you've added separately are likely to be in
> the default class (768MB datasize-cur and datasize-max).
>
> datasize-cur is a "soft limit", a user can increase it themselves with
> "ulimit -d <value>" up to the hard limit in datasize-max.
I learnt something!
> I'd start by putting the relevant user/s into "staff" class (as root,
> vipw, or "chsh <user>" and edit the Class: line), logout/login and
> retry. If it needs more than this, it maybe better to raise the soft
> limit for the individual program by using a shell alias or wrapper
> script rather than raising it across the board (OpenBSD doesn't cope
> very well if the entire system runs out of memory and this is a useful
> brake on runaway processes). For example you could use an alias like
> this:
>
> alias firefox="(ulimit -d $((3*1024*1024)); /usr/local/bin/firefox)"
Thanks, I'll do that when appropriate. At the moment it does not seem
to be a memory limitation issue.
By decreasing ulimit -d $((128*1024)), I can reproduce an immediate
crash of firefox-esr and get the same traceback message as generated by
abiword above. But there I *increased* the limits.
Thanks for the apropos(1) tip!
Marco
> On 2018/05/31 10:06, Marco van Hulten wrote:
> > Stuart,
> >
> > [...]
> >
> > I now see there are some limits [...] as normal user
> > [now given from ksh(1)]
$ ulimit -a
time(cpu-seconds) unlimited
file(blocks) unlimited
coredump(blocks) unlimited
data(kbytes) 786432
stack(kbytes) 4096
lockedmem(kbytes) 5303878
memory(kbytes) 15888396
nofiles(descriptors) 512
processes 128
I put myself in login class "staff", which increased limits, and then
increased limits a bit further where I could:
$ ulimit -a
time(cpu-seconds) unlimited
file(blocks) unlimited
coredump(blocks) unlimited
data(kbytes) 15728640
stack(kbytes) 4096
lockedmem(kbytes) 5503878
memory(kbytes) 15888396
nofiles(descriptors) 1024
processes 512
From this shell I started abiword, and get an immediate crash:
$ rm -rf ~/.config/abiword
$ abiword
Abort trap (core dumped)
$ gdb abiword abiword.core
[...]
Loaded symbols for /usr/local/lib/abiword-3.0/plugins/pdf.so
#0 thrkill () at -:3
3 -: No such file or directory.
in -
(gdb)
whereas calcurse stops in rthread.c, which I thought could be a
calcurse bug so I reported it [1], but I'm not sure at all anymore.
[1]: https://lists.calcurse.org/bugs/msg00261.html
Two days or so ago Firefox and Claws Mail crashed at arbitrary
moments. Just maybe this behaviour will stop now.
> Limits are grouped by login class (5th field in master.passwd). root
> is usually in "daemon" and the initial user created during install is
> in "staff" (default 1.5GB for datasize-cur, no limit for
> datasize-max). Users that you've added separately are likely to be in
> the default class (768MB datasize-cur and datasize-max).
>
> datasize-cur is a "soft limit", a user can increase it themselves with
> "ulimit -d <value>" up to the hard limit in datasize-max.
I learnt something!
> I'd start by putting the relevant user/s into "staff" class (as root,
> vipw, or "chsh <user>" and edit the Class: line), logout/login and
> retry. If it needs more than this, it maybe better to raise the soft
> limit for the individual program by using a shell alias or wrapper
> script rather than raising it across the board (OpenBSD doesn't cope
> very well if the entire system runs out of memory and this is a useful
> brake on runaway processes). For example you could use an alias like
> this:
>
> alias firefox="(ulimit -d $((3*1024*1024)); /usr/local/bin/firefox)"
Thanks, I'll do that when appropriate. At the moment it does not seem
to be a memory limitation issue.
By decreasing ulimit -d $((128*1024)), I can reproduce an immediate
crash of firefox-esr and get the same traceback message as generated by
abiword above. But there I *increased* the limits.
Thanks for the apropos(1) tip!
Marco
Re: PHP cleaner patch for preventing libodbc linking to SAPI
On 2018/05/31 13:53, Martijn van Duren wrote:
> The current patch removes the check altogether, this patch adds an
> extra check to make sure libodbc isn't linked to the SAPIs.
>
> This is similar to how other libraries setup the
> PHP_ADD_LIBRARY_WITH_PATH in their config.m4.
Seems an unnecessary change to the port, perhaps upstream will take it though.
> martijn@
>
> Index: 5.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.72
> diff -u -p -r1.72 Makefile
> --- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
> +++ 5.6/Makefile 31 May 2018 11:50:00 -0000
> @@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
>
> PV= 5.6
> V= ${PV}.36
> -REVISION= 4
> +REVISION= 5
>
> MASTER_SITES0= https://download.suhosin.org/
>
> Index: 5.6/patches/patch-ext_odbc_config_m4
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_odbc_config_m4,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-ext_odbc_config_m4
> --- 5.6/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:20:29 -0000 1.3
> +++ 5.6/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
> @@ -1,14 +1,25 @@
> $OpenBSD: patch-ext_odbc_config_m4,v 1.3 2015/04/25 16:20:29 robert Exp $
>
> -don't link php binary with iodbc
> +Unpatched some configure conditions can link libodbc to the SAPI.
>
> ---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
> -+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
> -@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
> +Index: ext/odbc/config.m4
> +--- ext/odbc/config.m4.orig
> ++++ ext/odbc/config.m4
> +@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
> AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
> fi
> if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
> - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> ODBC_TYPE=iodbc
> ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
> ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
> +@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
> + if test "$PHP_IODBC" = "yes"; then
> + PHP_IODBC=/usr/local
> + fi
> +- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> + PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
> + ODBC_TYPE=iodbc
> + ODBC_INCLUDE=-I$PHP_IODBC/include
> Index: 7.0/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- 7.0/Makefile 27 May 2018 22:05:50 -0000 1.55
> +++ 7.0/Makefile 31 May 2018 11:50:00 -0000
> @@ -2,7 +2,7 @@
>
> PV= 7.0
> V= ${PV}.30
> -REVISION= 4
> +REVISION= 5
>
> BUILD_DEPENDS+= devel/bison
>
> Index: 7.0/patches/patch-ext_odbc_config_m4
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_odbc_config_m4,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-ext_odbc_config_m4
> --- 7.0/patches/patch-ext_odbc_config_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
> +++ 7.0/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
> @@ -1,14 +1,25 @@
> $OpenBSD: patch-ext_odbc_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
>
> -don't link php binary with iodbc
> +Unpatched some configure conditions can link libodbc to the SAPI.
>
> ---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
> -+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
> -@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
> +Index: ext/odbc/config.m4
> +--- ext/odbc/config.m4.orig
> ++++ ext/odbc/config.m4
> +@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
> AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
> fi
> if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
> - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> ODBC_TYPE=iodbc
> ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
> ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
> +@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
> + if test "$PHP_IODBC" = "yes"; then
> + PHP_IODBC=/usr/local
> + fi
> +- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> + PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
> + ODBC_TYPE=iodbc
> + ODBC_INCLUDE=-I$PHP_IODBC/include
>
> The current patch removes the check altogether, this patch adds an
> extra check to make sure libodbc isn't linked to the SAPIs.
>
> This is similar to how other libraries setup the
> PHP_ADD_LIBRARY_WITH_PATH in their config.m4.
Seems an unnecessary change to the port, perhaps upstream will take it though.
> martijn@
>
> Index: 5.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.72
> diff -u -p -r1.72 Makefile
> --- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
> +++ 5.6/Makefile 31 May 2018 11:50:00 -0000
> @@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
>
> PV= 5.6
> V= ${PV}.36
> -REVISION= 4
> +REVISION= 5
>
> MASTER_SITES0= https://download.suhosin.org/
>
> Index: 5.6/patches/patch-ext_odbc_config_m4
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_odbc_config_m4,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-ext_odbc_config_m4
> --- 5.6/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:20:29 -0000 1.3
> +++ 5.6/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
> @@ -1,14 +1,25 @@
> $OpenBSD: patch-ext_odbc_config_m4,v 1.3 2015/04/25 16:20:29 robert Exp $
>
> -don't link php binary with iodbc
> +Unpatched some configure conditions can link libodbc to the SAPI.
>
> ---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
> -+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
> -@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
> +Index: ext/odbc/config.m4
> +--- ext/odbc/config.m4.orig
> ++++ ext/odbc/config.m4
> +@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
> AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
> fi
> if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
> - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> ODBC_TYPE=iodbc
> ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
> ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
> +@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
> + if test "$PHP_IODBC" = "yes"; then
> + PHP_IODBC=/usr/local
> + fi
> +- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> + PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
> + ODBC_TYPE=iodbc
> + ODBC_INCLUDE=-I$PHP_IODBC/include
> Index: 7.0/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- 7.0/Makefile 27 May 2018 22:05:50 -0000 1.55
> +++ 7.0/Makefile 31 May 2018 11:50:00 -0000
> @@ -2,7 +2,7 @@
>
> PV= 7.0
> V= ${PV}.30
> -REVISION= 4
> +REVISION= 5
>
> BUILD_DEPENDS+= devel/bison
>
> Index: 7.0/patches/patch-ext_odbc_config_m4
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_odbc_config_m4,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-ext_odbc_config_m4
> --- 7.0/patches/patch-ext_odbc_config_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
> +++ 7.0/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
> @@ -1,14 +1,25 @@
> $OpenBSD: patch-ext_odbc_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
>
> -don't link php binary with iodbc
> +Unpatched some configure conditions can link libodbc to the SAPI.
>
> ---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
> -+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
> -@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
> +Index: ext/odbc/config.m4
> +--- ext/odbc/config.m4.orig
> ++++ ext/odbc/config.m4
> +@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
> AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
> fi
> if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
> - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> ODBC_TYPE=iodbc
> ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
> ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
> +@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
> + if test "$PHP_IODBC" = "yes"; then
> + PHP_IODBC=/usr/local
> + fi
> +- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
> ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
> + PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
> + ODBC_TYPE=iodbc
> + ODBC_INCLUDE=-I$PHP_IODBC/include
>
Re: PHP force res_search even stronger
On 2018/05/31 14:50, Martijn van Duren wrote:
> Right now if libresolv or libsocket is picked up somewhere they are
> linked in.
Huh? "If some library that we don't have on OpenBSD is picked up ..."
> Right now if libresolv or libsocket is picked up somewhere they are
> linked in.
Huh? "If some library that we don't have on OpenBSD is picked up ..."
Re: Upgrade 6.0 -> 6.1: ix mmba is not mem space
On 2018/05/31 15:16, mxb wrote:
> With -stable kernel and modded syspatch I was able to pull down all the patches I needed to have this machine to be fully up to date.
As ever, you get to keep both pieces if it breaks, and please make
sure you mention this if you report any problems :-)
> With -stable kernel and modded syspatch I was able to pull down all the patches I needed to have this machine to be fully up to date.
As ever, you get to keep both pieces if it breaks, and please make
sure you mention this if you report any problems :-)
Re: Upgrade 6.0 -> 6.1: ix mmba is not mem space
With -stable kernel and modded syspatch I was able to pull down all the patches I needed to have this machine to be fully up to date.
Sent from my iDevice
> 30 мая 2018 г., в 18:59, Stuart Henderson <stu@spacehopper.org> написал(а):
>
>> On 2018-05-30, Maxim Bourmistrov <mxb@alumni.chalmers.se> wrote:
>> I ended up with a -stable kernel and syspatch refusing to pull down patches, but this is another story.
>
> syspatch is only for releases or systems which have been syspatch'ed directly
> from a release - it can't work with -stable, own-built kernels or kernels modified
> with config(8).
>
>
Sent from my iDevice
> 30 мая 2018 г., в 18:59, Stuart Henderson <stu@spacehopper.org> написал(а):
>
>> On 2018-05-30, Maxim Bourmistrov <mxb@alumni.chalmers.se> wrote:
>> I ended up with a -stable kernel and syspatch refusing to pull down patches, but this is another story.
>
> syspatch is only for releases or systems which have been syspatch'ed directly
> from a release - it can't work with -stable, own-built kernels or kernels modified
> with config(8).
>
>
PHP force res_search even stronger
Right now if libresolv or libsocket is picked up somewhere they are
linked in.
Diff below tightens the check and forces only res_search from libc.
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
+++ 5.6/Makefile 31 May 2018 12:48:48 -0000
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV= 5.6
V= ${PV}.36
-REVISION= 4
+REVISION= 5
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_standard_config_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ext_standard_config_m4
--- 5.6/patches/patch-ext_standard_config_m4 6 May 2016 19:59:32 -0000 1.2
+++ 5.6/patches/patch-ext_standard_config_m4 31 May 2018 12:48:48 -0000
@@ -1,7 +1,11 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.2 2016/05/06 19:59:32 sthen Exp $
---- ext/standard/config.m4.orig.port Thu Apr 28 01:33:49 2016
-+++ ext/standard/config.m4 Fri Apr 29 14:02:27 2016
-@@ -398,16 +398,16 @@ dnl
+
+Don't pick up libbind or libsocket if we them accidentally installed.
+
+Index: ext/standard/config.m4
+--- ext/standard/config.m4.orig
++++ ext/standard/config.m4
+@@ -398,16 +398,12 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
@@ -9,17 +13,13 @@ $OpenBSD: patch-ext_standard_config_m4,v
-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
-+PHP_CHECK_FUNC(dns_search, resolv, socket)
-+PHP_CHECK_FUNC(dn_expand, resolv, socket)
-+PHP_CHECK_FUNC(dn_skipname, resolv, socket)
dnl
dnl These are old deprecated functions
dnl
-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
++PHP_CHECK_FUNC(res_search)
dnl
dnl Check if atof() accepts NAN
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- 7.0/Makefile 27 May 2018 22:05:50 -0000 1.55
+++ 7.0/Makefile 31 May 2018 12:48:48 -0000
@@ -2,7 +2,7 @@
PV= 7.0
V= ${PV}.30
-REVISION= 4
+REVISION= 5
BUILD_DEPENDS+= devel/bison
Index: 7.0/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_standard_config_m4,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ext_standard_config_m4
--- 7.0/patches/patch-ext_standard_config_m4 12 Jun 2017 11:48:34 -0000 1.4
+++ 7.0/patches/patch-ext_standard_config_m4 31 May 2018 12:48:48 -0000
@@ -1,8 +1,11 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.4 2017/06/12 11:48:34 sthen Exp $
+
+Don't pick up libbind or libsocket if we them accidentally installed.
+
Index: ext/standard/config.m4
--- ext/standard/config.m4.orig
+++ ext/standard/config.m4
-@@ -401,17 +401,17 @@ dnl
+@@ -401,17 +401,12 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
@@ -11,18 +14,13 @@ Index: ext/standard/config.m4
-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
-+PHP_CHECK_FUNC(res_ndestroy, resolv, socket)
-+PHP_CHECK_FUNC(dns_search, resolv, socket)
-+PHP_CHECK_FUNC(dn_expand, resolv, socket)
-+PHP_CHECK_FUNC(dn_skipname, resolv, socket)
dnl
dnl These are old deprecated functions
dnl
-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
++PHP_CHECK_FUNC(res_search)
dnl
dnl Check if atof() accepts NAN
linked in.
Diff below tightens the check and forces only res_search from libc.
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
+++ 5.6/Makefile 31 May 2018 12:48:48 -0000
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV= 5.6
V= ${PV}.36
-REVISION= 4
+REVISION= 5
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_standard_config_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ext_standard_config_m4
--- 5.6/patches/patch-ext_standard_config_m4 6 May 2016 19:59:32 -0000 1.2
+++ 5.6/patches/patch-ext_standard_config_m4 31 May 2018 12:48:48 -0000
@@ -1,7 +1,11 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.2 2016/05/06 19:59:32 sthen Exp $
---- ext/standard/config.m4.orig.port Thu Apr 28 01:33:49 2016
-+++ ext/standard/config.m4 Fri Apr 29 14:02:27 2016
-@@ -398,16 +398,16 @@ dnl
+
+Don't pick up libbind or libsocket if we them accidentally installed.
+
+Index: ext/standard/config.m4
+--- ext/standard/config.m4.orig
++++ ext/standard/config.m4
+@@ -398,16 +398,12 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
@@ -9,17 +13,13 @@ $OpenBSD: patch-ext_standard_config_m4,v
-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
-+PHP_CHECK_FUNC(dns_search, resolv, socket)
-+PHP_CHECK_FUNC(dn_expand, resolv, socket)
-+PHP_CHECK_FUNC(dn_skipname, resolv, socket)
dnl
dnl These are old deprecated functions
dnl
-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
++PHP_CHECK_FUNC(res_search)
dnl
dnl Check if atof() accepts NAN
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- 7.0/Makefile 27 May 2018 22:05:50 -0000 1.55
+++ 7.0/Makefile 31 May 2018 12:48:48 -0000
@@ -2,7 +2,7 @@
PV= 7.0
V= ${PV}.30
-REVISION= 4
+REVISION= 5
BUILD_DEPENDS+= devel/bison
Index: 7.0/patches/patch-ext_standard_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_standard_config_m4,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ext_standard_config_m4
--- 7.0/patches/patch-ext_standard_config_m4 12 Jun 2017 11:48:34 -0000 1.4
+++ 7.0/patches/patch-ext_standard_config_m4 31 May 2018 12:48:48 -0000
@@ -1,8 +1,11 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.4 2017/06/12 11:48:34 sthen Exp $
+
+Don't pick up libbind or libsocket if we them accidentally installed.
+
Index: ext/standard/config.m4
--- ext/standard/config.m4.orig
+++ ext/standard/config.m4
-@@ -401,17 +401,17 @@ dnl
+@@ -401,17 +401,12 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
@@ -11,18 +14,13 @@ Index: ext/standard/config.m4
-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
-+PHP_CHECK_FUNC(res_ndestroy, resolv, socket)
-+PHP_CHECK_FUNC(dns_search, resolv, socket)
-+PHP_CHECK_FUNC(dn_expand, resolv, socket)
-+PHP_CHECK_FUNC(dn_skipname, resolv, socket)
dnl
dnl These are old deprecated functions
dnl
-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
-+PHP_CHECK_FUNC(res_search, resolv, socket)
++PHP_CHECK_FUNC(res_search)
dnl
dnl Check if atof() accepts NAN
PHP cleaner patch for preventing libodbc linking to SAPI
The current patch removes the check altogether, this patch adds an
extra check to make sure libodbc isn't linked to the SAPIs.
This is similar to how other libraries setup the
PHP_ADD_LIBRARY_WITH_PATH in their config.m4.
martijn@
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
+++ 5.6/Makefile 31 May 2018 11:50:00 -0000
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV= 5.6
V= ${PV}.36
-REVISION= 4
+REVISION= 5
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ext_odbc_config_m4
--- 5.6/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:20:29 -0000 1.3
+++ 5.6/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
@@ -1,14 +1,25 @@
$OpenBSD: patch-ext_odbc_config_m4,v 1.3 2015/04/25 16:20:29 robert Exp $
-don't link php binary with iodbc
+Unpatched some configure conditions can link libodbc to the SAPI.
---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
-@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
+Index: ext/odbc/config.m4
+--- ext/odbc/config.m4.orig
++++ ext/odbc/config.m4
+@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
ODBC_TYPE=iodbc
ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+ if test "$PHP_IODBC" = "yes"; then
+ PHP_IODBC=/usr/local
+ fi
+- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+ ODBC_TYPE=iodbc
+ ODBC_INCLUDE=-I$PHP_IODBC/include
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- 7.0/Makefile 27 May 2018 22:05:50 -0000 1.55
+++ 7.0/Makefile 31 May 2018 11:50:00 -0000
@@ -2,7 +2,7 @@
PV= 7.0
V= ${PV}.30
-REVISION= 4
+REVISION= 5
BUILD_DEPENDS+= devel/bison
Index: 7.0/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-ext_odbc_config_m4
--- 7.0/patches/patch-ext_odbc_config_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ 7.0/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
@@ -1,14 +1,25 @@
$OpenBSD: patch-ext_odbc_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
-don't link php binary with iodbc
+Unpatched some configure conditions can link libodbc to the SAPI.
---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
-@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
+Index: ext/odbc/config.m4
+--- ext/odbc/config.m4.orig
++++ ext/odbc/config.m4
+@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
ODBC_TYPE=iodbc
ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+ if test "$PHP_IODBC" = "yes"; then
+ PHP_IODBC=/usr/local
+ fi
+- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+ ODBC_TYPE=iodbc
+ ODBC_INCLUDE=-I$PHP_IODBC/include
extra check to make sure libodbc isn't linked to the SAPIs.
This is similar to how other libraries setup the
PHP_ADD_LIBRARY_WITH_PATH in their config.m4.
martijn@
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
+++ 5.6/Makefile 31 May 2018 11:50:00 -0000
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV= 5.6
V= ${PV}.36
-REVISION= 4
+REVISION= 5
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.6/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ext_odbc_config_m4
--- 5.6/patches/patch-ext_odbc_config_m4 25 Apr 2015 16:20:29 -0000 1.3
+++ 5.6/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
@@ -1,14 +1,25 @@
$OpenBSD: patch-ext_odbc_config_m4,v 1.3 2015/04/25 16:20:29 robert Exp $
-don't link php binary with iodbc
+Unpatched some configure conditions can link libodbc to the SAPI.
---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
-@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
+Index: ext/odbc/config.m4
+--- ext/odbc/config.m4.orig
++++ ext/odbc/config.m4
+@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
ODBC_TYPE=iodbc
ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+ if test "$PHP_IODBC" = "yes"; then
+ PHP_IODBC=/usr/local
+ fi
+- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+ ODBC_TYPE=iodbc
+ ODBC_INCLUDE=-I$PHP_IODBC/include
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- 7.0/Makefile 27 May 2018 22:05:50 -0000 1.55
+++ 7.0/Makefile 31 May 2018 11:50:00 -0000
@@ -2,7 +2,7 @@
PV= 7.0
V= ${PV}.30
-REVISION= 4
+REVISION= 5
BUILD_DEPENDS+= devel/bison
Index: 7.0/patches/patch-ext_odbc_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/7.0/patches/patch-ext_odbc_config_m4,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-ext_odbc_config_m4
--- 7.0/patches/patch-ext_odbc_config_m4 14 Dec 2015 17:58:45 -0000 1.1.1.1
+++ 7.0/patches/patch-ext_odbc_config_m4 31 May 2018 11:50:00 -0000
@@ -1,14 +1,25 @@
$OpenBSD: patch-ext_odbc_config_m4,v 1.1.1.1 2015/12/14 17:58:45 robert Exp $
-don't link php binary with iodbc
+Unpatched some configure conditions can link libodbc to the SAPI.
---- ext/odbc/config.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/odbc/config.m4 Sat Apr 25 18:10:11 2015
-@@ -396,7 +396,6 @@ PHP_ARG_WITH(iodbc,,
+Index: ext/odbc/config.m4
+--- ext/odbc/config.m4.orig
++++ ext/odbc/config.m4
+@@ -396,7 +396,7 @@ PHP_ARG_WITH(iodbc,,
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
ODBC_TYPE=iodbc
ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+@@ -409,7 +409,7 @@ PHP_ARG_WITH(iodbc,,
+ if test "$PHP_IODBC" = "yes"; then
+ PHP_IODBC=/usr/local
+ fi
+- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR, IODBC_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+ ODBC_TYPE=iodbc
+ ODBC_INCLUDE=-I$PHP_IODBC/include
Re: The compiler error about modifying libcrypto
On Thu, May 31, 2018 at 10:50:35AM +0800, Nan Xiao wrote:
> My OS is OpenBSD 6.3.
-current?
If not, please install the latest snapshot before trying to build
-current from source.
See also https://www.openbsd.org/faq/current.html
> Since now the -current modify the interface of
> libcrypto, there is error in "make":
> ......
> ===> lib/libcrypto
Don't do "make" from /usr/src.
Please read https://man.openbsd.org/release.8 and follow at least
up through step 3.
If you have things prepared as described in release(8) and you do
"make build", it will do "make includes" and install the current
headers, thus preventing the compilation failure you ran into.
> My OS is OpenBSD 6.3.
-current?
If not, please install the latest snapshot before trying to build
-current from source.
See also https://www.openbsd.org/faq/current.html
> Since now the -current modify the interface of
> libcrypto, there is error in "make":
> ......
> ===> lib/libcrypto
Don't do "make" from /usr/src.
Please read https://man.openbsd.org/release.8 and follow at least
up through step 3.
If you have things prepared as described in release(8) and you do
"make build", it will do "make includes" and install the current
headers, thus preventing the compilation failure you ran into.
Re: Update: audio/cmus ffmpeg fixes (MAINTAINER)
On Wed, May 30, 2018 at 12:52:19PM +0200, Donovan Watteau wrote:
> Sure, I can reproduce it with the file given in this issue:
> https://github.com/cmus/cmus/issues/204
>
> And I can confirm that the crash disappears with the above diff.
Same here, cheers.
OK kn
> Sure, I can reproduce it with the file given in this issue:
> https://github.com/cmus/cmus/issues/204
>
> And I can confirm that the crash disappears with the above diff.
Same here, cheers.
OK kn
Re: Dell Latitude and E-Port II: system hangs
OpenBSD 6.3-current (GENERIC.MP) #52: Wed May 30 13:42:02 MDT 2018
deraadt@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 16811323392 (16032MB)
avail mem = 16293675008 (15538MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.8 @ 0xeb460 (106 entries)
bios0: vendor Dell Inc. version "1.12.3" date 12/11/2016
bios0: Dell Inc. Latitude E7470
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC FPDT FIDT MCFG HPET SSDT LPIT SSDT SSDT SSDT DBGP DBG2 SSDT UEFI SSDT SSDT MSDM SLIC TCPA DMAR ASF!
acpi0: wakeup devices PEGP(S4) PEG0(S4) PEGP(S4) PEG1(S4) PEGP(S4) PEG2(S4) PXSX(S4) RP09(S4) PXSX(S4) RP10(S4) PXSX(S4) RP11(S4) PXSX(S4) RP12(S4) PXSX(S4) RP13(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz, 2095.86 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
using xsaveopt
cpu0: apic clock running at 23MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4.1.1.1, IBE
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz, 2095.11 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,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) i5-6300U CPU @ 2.40GHz, 2095.11 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,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) i5-6300U CPU @ 2.40GHz, 2095.11 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 120 pins
acpimcfg0 at acpi0 addr 0xf0000000, bus 0-127
acpihpet0 at acpi0: 23999999 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (PEG0)
acpiprt2 at acpi0: bus -1 (PEG1)
acpiprt3 at acpi0: bus -1 (PEG2)
acpiprt4 at acpi0: bus -1 (RP09)
acpiprt5 at acpi0: bus -1 (RP10)
acpiprt6 at acpi0: bus -1 (RP11)
acpiprt7 at acpi0: bus -1 (RP12)
acpiprt8 at acpi0: bus -1 (RP13)
acpiprt9 at acpi0: bus -1 (RP01)
acpiprt10 at acpi0: bus -1 (RP02)
acpiprt11 at acpi0: bus -1 (RP03)
acpiprt12 at acpi0: bus -1 (RP04)
acpiprt13 at acpi0: bus 1 (RP05)
acpiprt14 at acpi0: bus 2 (RP06)
acpiprt15 at acpi0: bus -1 (RP07)
acpiprt16 at acpi0: bus -1 (RP08)
acpiprt17 at acpi0: bus -1 (RP17)
acpiprt18 at acpi0: bus -1 (RP18)
acpiprt19 at acpi0: bus -1 (RP19)
acpiprt20 at acpi0: bus -1 (RP20)
acpiprt21 at acpi0: bus -1 (RP14)
acpiprt22 at acpi0: bus -1 (RP15)
acpiprt23 at acpi0: bus -1 (RP16)
acpiec0 at acpi0
acpiec at acpi0 not configured
acpicpu0 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu1 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu2 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu3 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpipwrres0 at acpi0: PG00, resource for PEG0
acpipwrres1 at acpi0: PG01, resource for PEG1
acpipwrres2 at acpi0: PG02, resource for PEG2
acpipwrres3 at acpi0: WRST
acpipwrres4 at acpi0: WRST
acpipwrres5 at acpi0: WRST
acpipwrres6 at acpi0: WRST
acpipwrres7 at acpi0: WRST
acpipwrres8 at acpi0: WRST
acpipwrres9 at acpi0: WRST
acpipwrres10 at acpi0: WRST
acpipwrres11 at acpi0: WRST
acpipwrres12 at acpi0: WRST
acpipwrres13 at acpi0: WRST
acpipwrres14 at acpi0: WRST
acpipwrres15 at acpi0: WRST
acpipwrres16 at acpi0: WRST
acpipwrres17 at acpi0: WRST
acpipwrres18 at acpi0: WRST
acpipwrres19 at acpi0: WRST
acpipwrres20 at acpi0: WRST
acpipwrres21 at acpi0: WRST
acpipwrres22 at acpi0: WRST
acpitz0 at acpi0: critical temperature is 107 degC
acpicmos0 at acpi0
"INT3F0D" at acpi0 not configured
"INT3403" at acpi0 not configured
"INT3403" at acpi0 not configured
"DLLK06DC" at acpi0 not configured
"DLL06DC" at acpi0 not configured
"INT3403" at acpi0 not configured
"INT33A1" at acpi0 not configured
tpm0 at acpi0: TPM_ addr 0xfed40000/0x1000: WEC WPCT200 rev 0x2
"PNP0C14" at acpi0 not configured
acpibtn0 at acpi0: LID0
acpibtn1 at acpi0: PBTN
acpibtn2 at acpi0: SBTN
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT0 model "DELL NJJ2H72" serial 49293 type LION oem "LGC-LGC3.65"
"DELLABC6" at acpi0 not configured
"DELLABCE" at acpi0 not configured
"INT340E" at acpi0 not configured
"INT3400" at acpi0 not configured
"INT3420" at acpi0 not configured
acpivideo0 at acpi0: GFX0
acpivout0 at acpivideo0: LCD_
cpu0: Enhanced SpeedStep 2095 MHz: speeds: 2501, 2500, 2200, 2100, 2000, 1900, 1700, 1600, 1400, 1300, 1100, 1000, 800, 700, 500, 400 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel Core 6G Host" rev 0x08
inteldrm0 at pci0 dev 2 function 0 "Intel HD Graphics 520" rev 0x07
drm0 at inteldrm0
inteldrm0: msi
error: [drm:pid0:i915_firmware_load_error_print] *ERROR* failed to load firmware i915/skl_dmc_ver1.bin (-22)
error: [drm:pid0:i915_gem_init_hw] *ERROR* Failed to initialize GuC, error -8 (ignored)
inteldrm0: 1920x1080, 32bpp
wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation)
wsdisplay0: screen 1-5 added (std, vt100 emulation)
"Intel Core 6G Thermal" rev 0x08 at pci0 dev 4 function 0 not configured
xhci0 at pci0 dev 20 function 0 "Intel 100 Series xHCI" rev 0x21: msi, xHCI 1.0
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev 3.00/1.00 addr 1
pchtemp0 at pci0 dev 20 function 2 "Intel 100 Series Thermal" rev 0x21
"Intel 100 Series MEI" rev 0x21 at pci0 dev 22 function 0 not configured
ahci0 at pci0 dev 23 function 0 "Intel 100 Series AHCI" rev 0x21: msi, AHCI 1.3.1
ahci0: PHY offline on port 0
ahci0: port 2: 6.0Gb/s
scsibus1 at ahci0: 32 targets
sd0 at scsibus1 targ 2 lun 0: <ATA, Micron 1100 SATA, M0D> SCSI3 0/direct fixed naa.500a075115dc1509
sd0: 488386MB, 512 bytes/sector, 1000215216 sectors, thin
ppb0 at pci0 dev 28 function 0 "Intel 100 Series PCIE" rev 0xf1: msi
pci1 at ppb0 bus 1
iwm0 at pci1 dev 0 function 0 "Intel Dual Band Wireless AC 8260" rev 0x3a, msi
ppb1 at pci0 dev 28 function 5 "Intel 100 Series PCIE" rev 0xf1: msi
pci2 at ppb1 bus 2
vendor "Intel", unknown product 0x093c (class network subclass miscellaneous, rev 0x3a) at pci2 dev 0 function 0 not configured
pcib0 at pci0 dev 31 function 0 "Intel 100 Series LPC" rev 0x21
"Intel 100 Series PMC" rev 0x21 at pci0 dev 31 function 2 not configured
azalia0 at pci0 dev 31 function 3 "Intel 100 Series HD Audio" rev 0x21: msi
azalia0: codecs: Realtek/0x0293, Intel/0x2809, using Realtek/0x0293
audio0 at azalia0
ichiic0 at pci0 dev 31 function 4 "Intel 100 Series SMBus" rev 0x21: apic 2 int 16
iic0 at ichiic0
em0 at pci0 dev 31 function 6 "Intel I219-LM" rev 0x21: msi, address d4:81:d7:a3:c1:4b
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pms0 at pckbc0 (aux slot)
wsmouse0 at pms0 mux 0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: VMX/EPT
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
uhub1 at uhub0 port 5 configuration 1 interface 0 "SMSC USB2134" rev 2.10/41.03 addr 2
uhub2 at uhub1 port 1 configuration 1 interface 0 "Dell USB 2.0 Hub [MTT]" rev 2.00/32.98 addr 3
uhidev0 at uhub2 port 4 configuration 1 interface 0 "Dell Dell Wired Multimedia Keyboard" rev 1.10/0.06 addr 4
uhidev0: iclass 3/1
ukbd0 at uhidev0: 8 variable keys, 6 key codes
wskbd1 at ukbd0 mux 1
wskbd1: connecting to wsdisplay0
uhidev1 at uhub2 port 4 configuration 1 interface 1 "Dell Dell Wired Multimedia Keyboard" rev 1.10/0.06 addr 4
uhidev1: iclass 3/1, 5 report ids
ums0 at uhidev1 reportid 1: 3 buttons, Z dir
wsmouse1 at ums0 mux 0
uhid0 at uhidev1 reportid 2: input=1, output=0, feature=0
uhid1 at uhidev1 reportid 3: input=3, output=0, feature=0
uhid2 at uhidev1 reportid 5: input=0, output=0, feature=5
uhidev2 at uhub1 port 2 configuration 1 interface 0 "Primax Electronics DELL Laser Mouse" rev 2.00/7.17 addr 5
uhidev2: iclass 3/1
ums1 at uhidev2: 5 buttons, Z dir
wsmouse2 at ums1 mux 0
uhub3 at uhub0 port 6 configuration 1 interface 0 "Dell product 0x2513" rev 2.00/0.05 addr 6
ugen0 at uhub0 port 7 "Broadcom Corp 5880" rev 1.10/1.01 addr 7
uhub4 at uhub0 port 14 configuration 1 interface 0 "SMSC USB5534" rev 3.00/41.03 addr 8
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
root on sd0a (4fb7869c3d80531f.a) swap on sd0b dump on sd0b
iwm0: hw rev 0x200, fw ver 16.242414.0, address b8:08:cf:5e:8e:f4
error: [drm:pid47136:intel_pipe_update_start] *ERROR* Potential atomic update failure on pipe B
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A plane 1 (expected (0,860), found (0,438))
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A cursor (expected (860,892), found (438,446))
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
On 25 May 17:22 Marco van Hulten wrote:
> On 25 May 13:50 Marco van Hulten wrote:
> > I have a Dell Latitude E7470 with the latest OpenBSD snapshot. It
> > boots fine when not connected to a docking station. When I connect
> > it to a DELL E-Port II (Model No: PR03X) docking station, it
> > crashes with the following kernel error:
> >
> > error: [drm:pid8048:i915_gem_init_hw] *ERROR* Failed to initialize
> > GuC, error -9 (ignored) error:
> > [drm:pid73911:intel_dp_link_training_clock_recovery] *ERROR* too
> > many full retries, give up error:
> > [drm:pid73911:intel_dp_aux_wait_done] *ERROR* dp aux hw did not
> > signal timeout (has irq: 1)! error:
> > [drm:pid73911:intel_dp_set_idle_link_train] *ERROR* Timed out
> > waiting for DP idle patterns
>
> This specific issue appears to have disappeared (for now). I'm typing
> this on the laptop, running OpenBSD, with the docking station
> attached.
During the last boot, just after fs check, I got this:
kernel: double fault trap, code=0
Stopped at Xsyscall+0x3: movq %r15,%gs:0x8
ddb{0}>
The system was unresponsive. Next boot, it came up (writing this
e-mail on the system, dmesg attached), but the console log shows issues:
error: [drm:pid47136:intel_pipe_update_start] *ERROR* Potential atomic update failure on pipe B
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A plane 1 (expected (0,860), found (0,438))
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A cursor (expected (860,892), found (438,446))
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
Possibly, only the first one sits close to the hardware (I don't know).
The other four messages sugges interaction with the window manager
(current spectrwm package).
Marco
deraadt@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 16811323392 (16032MB)
avail mem = 16293675008 (15538MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.8 @ 0xeb460 (106 entries)
bios0: vendor Dell Inc. version "1.12.3" date 12/11/2016
bios0: Dell Inc. Latitude E7470
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC FPDT FIDT MCFG HPET SSDT LPIT SSDT SSDT SSDT DBGP DBG2 SSDT UEFI SSDT SSDT MSDM SLIC TCPA DMAR ASF!
acpi0: wakeup devices PEGP(S4) PEG0(S4) PEGP(S4) PEG1(S4) PEGP(S4) PEG2(S4) PXSX(S4) RP09(S4) PXSX(S4) RP10(S4) PXSX(S4) RP11(S4) PXSX(S4) RP12(S4) PXSX(S4) RP13(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz, 2095.86 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
using xsaveopt
cpu0: apic clock running at 23MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4.1.1.1, IBE
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz, 2095.11 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,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) i5-6300U CPU @ 2.40GHz, 2095.11 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,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) i5-6300U CPU @ 2.40GHz, 2095.11 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,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 120 pins
acpimcfg0 at acpi0 addr 0xf0000000, bus 0-127
acpihpet0 at acpi0: 23999999 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (PEG0)
acpiprt2 at acpi0: bus -1 (PEG1)
acpiprt3 at acpi0: bus -1 (PEG2)
acpiprt4 at acpi0: bus -1 (RP09)
acpiprt5 at acpi0: bus -1 (RP10)
acpiprt6 at acpi0: bus -1 (RP11)
acpiprt7 at acpi0: bus -1 (RP12)
acpiprt8 at acpi0: bus -1 (RP13)
acpiprt9 at acpi0: bus -1 (RP01)
acpiprt10 at acpi0: bus -1 (RP02)
acpiprt11 at acpi0: bus -1 (RP03)
acpiprt12 at acpi0: bus -1 (RP04)
acpiprt13 at acpi0: bus 1 (RP05)
acpiprt14 at acpi0: bus 2 (RP06)
acpiprt15 at acpi0: bus -1 (RP07)
acpiprt16 at acpi0: bus -1 (RP08)
acpiprt17 at acpi0: bus -1 (RP17)
acpiprt18 at acpi0: bus -1 (RP18)
acpiprt19 at acpi0: bus -1 (RP19)
acpiprt20 at acpi0: bus -1 (RP20)
acpiprt21 at acpi0: bus -1 (RP14)
acpiprt22 at acpi0: bus -1 (RP15)
acpiprt23 at acpi0: bus -1 (RP16)
acpiec0 at acpi0
acpiec at acpi0 not configured
acpicpu0 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu1 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu2 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpicpu3 at acpi0: C3(200@1034 mwait.1@0x60), C2(200@151 mwait.1@0x33), C1(1000@1 mwait.1), PSS
acpipwrres0 at acpi0: PG00, resource for PEG0
acpipwrres1 at acpi0: PG01, resource for PEG1
acpipwrres2 at acpi0: PG02, resource for PEG2
acpipwrres3 at acpi0: WRST
acpipwrres4 at acpi0: WRST
acpipwrres5 at acpi0: WRST
acpipwrres6 at acpi0: WRST
acpipwrres7 at acpi0: WRST
acpipwrres8 at acpi0: WRST
acpipwrres9 at acpi0: WRST
acpipwrres10 at acpi0: WRST
acpipwrres11 at acpi0: WRST
acpipwrres12 at acpi0: WRST
acpipwrres13 at acpi0: WRST
acpipwrres14 at acpi0: WRST
acpipwrres15 at acpi0: WRST
acpipwrres16 at acpi0: WRST
acpipwrres17 at acpi0: WRST
acpipwrres18 at acpi0: WRST
acpipwrres19 at acpi0: WRST
acpipwrres20 at acpi0: WRST
acpipwrres21 at acpi0: WRST
acpipwrres22 at acpi0: WRST
acpitz0 at acpi0: critical temperature is 107 degC
acpicmos0 at acpi0
"INT3F0D" at acpi0 not configured
"INT3403" at acpi0 not configured
"INT3403" at acpi0 not configured
"DLLK06DC" at acpi0 not configured
"DLL06DC" at acpi0 not configured
"INT3403" at acpi0 not configured
"INT33A1" at acpi0 not configured
tpm0 at acpi0: TPM_ addr 0xfed40000/0x1000: WEC WPCT200 rev 0x2
"PNP0C14" at acpi0 not configured
acpibtn0 at acpi0: LID0
acpibtn1 at acpi0: PBTN
acpibtn2 at acpi0: SBTN
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT0 model "DELL NJJ2H72" serial 49293 type LION oem "LGC-LGC3.65"
"DELLABC6" at acpi0 not configured
"DELLABCE" at acpi0 not configured
"INT340E" at acpi0 not configured
"INT3400" at acpi0 not configured
"INT3420" at acpi0 not configured
acpivideo0 at acpi0: GFX0
acpivout0 at acpivideo0: LCD_
cpu0: Enhanced SpeedStep 2095 MHz: speeds: 2501, 2500, 2200, 2100, 2000, 1900, 1700, 1600, 1400, 1300, 1100, 1000, 800, 700, 500, 400 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel Core 6G Host" rev 0x08
inteldrm0 at pci0 dev 2 function 0 "Intel HD Graphics 520" rev 0x07
drm0 at inteldrm0
inteldrm0: msi
error: [drm:pid0:i915_firmware_load_error_print] *ERROR* failed to load firmware i915/skl_dmc_ver1.bin (-22)
error: [drm:pid0:i915_gem_init_hw] *ERROR* Failed to initialize GuC, error -8 (ignored)
inteldrm0: 1920x1080, 32bpp
wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation)
wsdisplay0: screen 1-5 added (std, vt100 emulation)
"Intel Core 6G Thermal" rev 0x08 at pci0 dev 4 function 0 not configured
xhci0 at pci0 dev 20 function 0 "Intel 100 Series xHCI" rev 0x21: msi, xHCI 1.0
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev 3.00/1.00 addr 1
pchtemp0 at pci0 dev 20 function 2 "Intel 100 Series Thermal" rev 0x21
"Intel 100 Series MEI" rev 0x21 at pci0 dev 22 function 0 not configured
ahci0 at pci0 dev 23 function 0 "Intel 100 Series AHCI" rev 0x21: msi, AHCI 1.3.1
ahci0: PHY offline on port 0
ahci0: port 2: 6.0Gb/s
scsibus1 at ahci0: 32 targets
sd0 at scsibus1 targ 2 lun 0: <ATA, Micron 1100 SATA, M0D> SCSI3 0/direct fixed naa.500a075115dc1509
sd0: 488386MB, 512 bytes/sector, 1000215216 sectors, thin
ppb0 at pci0 dev 28 function 0 "Intel 100 Series PCIE" rev 0xf1: msi
pci1 at ppb0 bus 1
iwm0 at pci1 dev 0 function 0 "Intel Dual Band Wireless AC 8260" rev 0x3a, msi
ppb1 at pci0 dev 28 function 5 "Intel 100 Series PCIE" rev 0xf1: msi
pci2 at ppb1 bus 2
vendor "Intel", unknown product 0x093c (class network subclass miscellaneous, rev 0x3a) at pci2 dev 0 function 0 not configured
pcib0 at pci0 dev 31 function 0 "Intel 100 Series LPC" rev 0x21
"Intel 100 Series PMC" rev 0x21 at pci0 dev 31 function 2 not configured
azalia0 at pci0 dev 31 function 3 "Intel 100 Series HD Audio" rev 0x21: msi
azalia0: codecs: Realtek/0x0293, Intel/0x2809, using Realtek/0x0293
audio0 at azalia0
ichiic0 at pci0 dev 31 function 4 "Intel 100 Series SMBus" rev 0x21: apic 2 int 16
iic0 at ichiic0
em0 at pci0 dev 31 function 6 "Intel I219-LM" rev 0x21: msi, address d4:81:d7:a3:c1:4b
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pms0 at pckbc0 (aux slot)
wsmouse0 at pms0 mux 0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: VMX/EPT
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
uhub1 at uhub0 port 5 configuration 1 interface 0 "SMSC USB2134" rev 2.10/41.03 addr 2
uhub2 at uhub1 port 1 configuration 1 interface 0 "Dell USB 2.0 Hub [MTT]" rev 2.00/32.98 addr 3
uhidev0 at uhub2 port 4 configuration 1 interface 0 "Dell Dell Wired Multimedia Keyboard" rev 1.10/0.06 addr 4
uhidev0: iclass 3/1
ukbd0 at uhidev0: 8 variable keys, 6 key codes
wskbd1 at ukbd0 mux 1
wskbd1: connecting to wsdisplay0
uhidev1 at uhub2 port 4 configuration 1 interface 1 "Dell Dell Wired Multimedia Keyboard" rev 1.10/0.06 addr 4
uhidev1: iclass 3/1, 5 report ids
ums0 at uhidev1 reportid 1: 3 buttons, Z dir
wsmouse1 at ums0 mux 0
uhid0 at uhidev1 reportid 2: input=1, output=0, feature=0
uhid1 at uhidev1 reportid 3: input=3, output=0, feature=0
uhid2 at uhidev1 reportid 5: input=0, output=0, feature=5
uhidev2 at uhub1 port 2 configuration 1 interface 0 "Primax Electronics DELL Laser Mouse" rev 2.00/7.17 addr 5
uhidev2: iclass 3/1
ums1 at uhidev2: 5 buttons, Z dir
wsmouse2 at ums1 mux 0
uhub3 at uhub0 port 6 configuration 1 interface 0 "Dell product 0x2513" rev 2.00/0.05 addr 6
ugen0 at uhub0 port 7 "Broadcom Corp 5880" rev 1.10/1.01 addr 7
uhub4 at uhub0 port 14 configuration 1 interface 0 "SMSC USB5534" rev 3.00/41.03 addr 8
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
root on sd0a (4fb7869c3d80531f.a) swap on sd0b dump on sd0b
iwm0: hw rev 0x200, fw ver 16.242414.0, address b8:08:cf:5e:8e:f4
error: [drm:pid47136:intel_pipe_update_start] *ERROR* Potential atomic update failure on pipe B
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A plane 1 (expected (0,860), found (0,438))
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A cursor (expected (860,892), found (438,446))
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
On 25 May 17:22 Marco van Hulten wrote:
> On 25 May 13:50 Marco van Hulten wrote:
> > I have a Dell Latitude E7470 with the latest OpenBSD snapshot. It
> > boots fine when not connected to a docking station. When I connect
> > it to a DELL E-Port II (Model No: PR03X) docking station, it
> > crashes with the following kernel error:
> >
> > error: [drm:pid8048:i915_gem_init_hw] *ERROR* Failed to initialize
> > GuC, error -9 (ignored) error:
> > [drm:pid73911:intel_dp_link_training_clock_recovery] *ERROR* too
> > many full retries, give up error:
> > [drm:pid73911:intel_dp_aux_wait_done] *ERROR* dp aux hw did not
> > signal timeout (has irq: 1)! error:
> > [drm:pid73911:intel_dp_set_idle_link_train] *ERROR* Timed out
> > waiting for DP idle patterns
>
> This specific issue appears to have disappeared (for now). I'm typing
> this on the laptop, running OpenBSD, with the docking station
> attached.
During the last boot, just after fs check, I got this:
kernel: double fault trap, code=0
Stopped at Xsyscall+0x3: movq %r15,%gs:0x8
ddb{0}>
The system was unresponsive. Next boot, it came up (writing this
e-mail on the system, dmesg attached), but the console log shows issues:
error: [drm:pid47136:intel_pipe_update_start] *ERROR* Potential atomic update failure on pipe B
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A plane 1 (expected (0,860), found (0,438))
error: [drm:pid38604:check_wm_state] *ERROR* mismatch in DDB state pipe A cursor (expected (860,892), found (438,446))
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
WARNING !wm_changed failed at /usr/src/sys/dev/pci/drm/i915/intel_pm.c:3609
Possibly, only the first one sits close to the hardware (I don't know).
The other four messages sugges interaction with the window manager
(current spectrwm package).
Marco
Re: update x11/stumpwm
Klemens Nanni writes:
> On Thu, May 31, 2018 at 09:48:11AM +0200, Solene Rapenne wrote:
>> A new version of StumpWM has been released, the versioning changed from
>> a regular major.minor to YY.MM so new version is 18.05. It requires the
>> extra lisp library "alexandria". I choosed to add clx-xembed library too
>> because it's required for contributes modules (not included in the
>> package) and it adds no weight.
> I need to build twice to get it working. Not sure why, the output from
> `{ make build; make build; } 2>&1' attached.
>
> @@ -18,11 +18,15 @@ WANTLIB += c m util
>>
>> MASTER_SITES= https://github.com/stumpwm/stumpwm/archive/
>> MASTER_SITES0= https://github.com/edicl/cl-ppcre/archive/
>> -MASTER_SITES1= http://beta.quicklisp.org/archive/clx/2017-02-27/
>> +MASTER_SITES1= http://beta.quicklisp.org/archive/clx/2018-04-30/
> This can go HTTPS, too.
I tried on 2 differents systems and I am not able to reproduce your
issue. I will try on a fresh -current install.
I'm curious if you have some special flags for mounting /tmp?
Thanks for the https links.
> On Thu, May 31, 2018 at 09:48:11AM +0200, Solene Rapenne wrote:
>> A new version of StumpWM has been released, the versioning changed from
>> a regular major.minor to YY.MM so new version is 18.05. It requires the
>> extra lisp library "alexandria". I choosed to add clx-xembed library too
>> because it's required for contributes modules (not included in the
>> package) and it adds no weight.
> I need to build twice to get it working. Not sure why, the output from
> `{ make build; make build; } 2>&1' attached.
>
> @@ -18,11 +18,15 @@ WANTLIB += c m util
>>
>> MASTER_SITES= https://github.com/stumpwm/stumpwm/archive/
>> MASTER_SITES0= https://github.com/edicl/cl-ppcre/archive/
>> -MASTER_SITES1= http://beta.quicklisp.org/archive/clx/2017-02-27/
>> +MASTER_SITES1= http://beta.quicklisp.org/archive/clx/2018-04-30/
> This can go HTTPS, too.
I tried on 2 differents systems and I am not able to reproduce your
issue. I will try on a fresh -current install.
I'm curious if you have some special flags for mounting /tmp?
Thanks for the https links.
Re: VMM can't boot from *.iso files, right?
On Wed, May 30, 2018 at 08:25:43PM -0700, Mike Larkin wrote:
> FreeBSD requires some work still. Not sure about DFly.
>
> -ml
>
Does that mean I can only boot OpenBSD and GNU/Linux?
I tried to boot NetBSD, it panics too.
> FreeBSD requires some work still. Not sure about DFly.
>
> -ml
>
Does that mean I can only boot OpenBSD and GNU/Linux?
I tried to boot NetBSD, it panics too.
PHP removal of old patches
The following diff removes quite a few patches that are in my opinion
redundant. I motivation behind the removal is the following:
patch-acinclude_m4:
1st section: Doesn't seem to do anything (I might have missed something)
2nd section: Doesn't seem logical to disable an enabled check
3rd section: PHP_OPENSSL is set lines before
patch-ext_gd_gdcache_h:
malloc.h is removed
patch-ext_gd_libgd_gdkanji_c, patch-ext_iconv_iconv_c,
patch-ext_xmlrpc_libxmlrpc_encodings_c:
convert to const seems useless
patch-ext_mysqlnd_config9_m4:
mysqlnd is enabled via configure
patch-ext_openssl_config0_m4:
libssl already links to libcrypto. Also the check is not there in 7.0.
patch-ext_sockets_sockaddr_conv_c:
proper HAVE_AI_V4MAPPED check
patch-ext_spl_php_spl_c, patch-ext_spl_php_spl_h:
pointer type doesn't seem to matter
patch-main_php_h:
proper HAVE_SOCKLEN_T check
patch-main_php_open_temporary_file_c:
Worth the patch for mkstemp? Note that by examining the binary there's
also other places where we don't add the extra Xs.
patch-sapi_cli_php_cli_c:
adds unneeded char *ini
martijn@
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
+++ 5.6/Makefile 31 May 2018 10:38:43 -0000
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV= 5.6
V= ${PV}.36
-REVISION= 4
+REVISION= 5
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: 5.6/patches/patch-ext_gd_gdcache_h
diff -N 5.6/patches/patch-ext_gd_gdcache_h
--- 5.6/patches/patch-ext_gd_gdcache_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_gd_gdcache_h,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/gd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/gdcache.h Sat Jun 18 12:14:48 2011
-@@ -41,6 +41,7 @@
- /*********************************************************/
-
- #if (!defined(_OSD_POSIX) && !defined(__FreeBSD__)) && HAVE_MALLOC_H
-+#elif !defined(__OpenBSD__)
- #include <malloc.h>
- #else
- #include <stdlib.h> /* BS2000/OSD defines malloc() & friends in stdlib.h */
Index: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
diff -N 5.6/patches/patch-ext_gd_libgd_gdkanji_c
--- 5.6/patches/patch-ext_gd_libgd_gdkanji_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
-@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
- from_len = strlen ((const char *) from) + 1;
- to_len = BUFSIZ;
-
-- if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1)
-+ if ((int) iconv(cd, (const char **) &from, &from_len, (char **) &to, &to_len) == -1)
- {
- #ifdef HAVE_ERRNO_H
- if (errno == EINVAL)
Index: 5.6/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: 5.6/patches/patch-ext_iconv_iconv_c
diff -N 5.6/patches/patch-ext_iconv_iconv_c
--- 5.6/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:06:23 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:06:23 robert Exp $
---- ext/iconv/iconv.c.orig.port Fri Jul 10 02:33:32 2015
-+++ ext/iconv/iconv.c Sun Jul 12 16:05:11 2015
-@@ -463,7 +463,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
-
- out_p = (d)->c + (d)->len;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EINVAL:
-@@ -650,7 +650,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
- out_p = out_buf;
-
- while (in_left > 0) {
-- result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
-+ result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
- out_size = bsz - out_left;
- if (result == (size_t)(-1)) {
- if (ignore_ilseq && errno == EILSEQ) {
-@@ -775,7 +775,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
-
- prev_in_left = in_left;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- if (prev_in_left == in_left) {
- break;
- }
-@@ -896,7 +896,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr
-
- prev_in_left = in_left;
-
-- if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd1, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- if (prev_in_left == in_left) {
- break;
- }
-@@ -1028,7 +1028,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
-
- prev_in_left = in_left;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- if (prev_in_left == in_left) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
-@@ -1277,7 +1277,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
-
- out_left = out_size - out_reserved;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EINVAL:
-@@ -1377,7 +1377,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
- out_p = buf;
- out_left = out_size;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EINVAL:
-@@ -2650,7 +2650,7 @@ static int php_iconv_stream_filter_append_bucket(
- tcnt = self->stub_len;
-
- while (tcnt > 0) {
-- if (iconv(self->cd, &pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
-+ if (iconv(self->cd, (const char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EILSEQ:
Index: 5.6/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: 5.6/patches/patch-ext_mysqlnd_config9_m4
diff -N 5.6/patches/patch-ext_mysqlnd_config9_m4
--- 5.6/patches/patch-ext_mysqlnd_config9_m4 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/mysqlnd/config9.m4.orig.port Wed Jul 3 08:10:53 2013
-+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
-@@ -16,6 +16,7 @@ if test -z "$PHP_ZLIB_DIR"; then
- fi
-
- dnl If some extension uses mysqlnd it will get compiled in PHP core
-+PHP_MYSQLND_ENABLED="yes"
- if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
- mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
- mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
Index: 5.6/patches/patch-ext_openssl_config0_m4
===================================================================
RCS file: 5.6/patches/patch-ext_openssl_config0_m4
diff -N 5.6/patches/patch-ext_openssl_config0_m4
--- 5.6/patches/patch-ext_openssl_config0_m4 25 May 2018 13:59:19 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_openssl_config0_m4,v 1.3 2018/05/25 13:59:19 sthen Exp $
---- ext/openssl/config0.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/openssl/config0.m4 Sat Apr 25 18:10:11 2015
-@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
- PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
- fi
-
-- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
-+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
- AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
- AC_CHECK_FUNCS([RAND_egd])
-
Index: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
diff -N 5.6/patches/patch-ext_sockets_sockaddr_conv_c
--- 5.6/patches/patch-ext_sockets_sockaddr_conv_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar 5 10:18:00 2014
-+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
-@@ -11,6 +11,10 @@
-
- extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
-
-+#if defined(__OpenBSD__)
-+#define AI_V4MAPPED 0
-+
redundant. I motivation behind the removal is the following:
patch-acinclude_m4:
1st section: Doesn't seem to do anything (I might have missed something)
2nd section: Doesn't seem logical to disable an enabled check
3rd section: PHP_OPENSSL is set lines before
patch-ext_gd_gdcache_h:
malloc.h is removed
patch-ext_gd_libgd_gdkanji_c, patch-ext_iconv_iconv_c,
patch-ext_xmlrpc_libxmlrpc_encodings_c:
convert to const seems useless
patch-ext_mysqlnd_config9_m4:
mysqlnd is enabled via configure
patch-ext_openssl_config0_m4:
libssl already links to libcrypto. Also the check is not there in 7.0.
patch-ext_sockets_sockaddr_conv_c:
proper HAVE_AI_V4MAPPED check
patch-ext_spl_php_spl_c, patch-ext_spl_php_spl_h:
pointer type doesn't seem to matter
patch-main_php_h:
proper HAVE_SOCKLEN_T check
patch-main_php_open_temporary_file_c:
Worth the patch for mkstemp? Note that by examining the binary there's
also other places where we don't add the extra Xs.
patch-sapi_cli_php_cli_c:
adds unneeded char *ini
martijn@
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- 5.6/Makefile 27 May 2018 22:05:50 -0000 1.72
+++ 5.6/Makefile 31 May 2018 10:38:43 -0000
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV= 5.6
V= ${PV}.36
-REVISION= 4
+REVISION= 5
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/patches/patch-ext_gd_gdcache_h
===================================================================
RCS file: 5.6/patches/patch-ext_gd_gdcache_h
diff -N 5.6/patches/patch-ext_gd_gdcache_h
--- 5.6/patches/patch-ext_gd_gdcache_h 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_gd_gdcache_h,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/gd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/gdcache.h Sat Jun 18 12:14:48 2011
-@@ -41,6 +41,7 @@
- /*********************************************************/
-
- #if (!defined(_OSD_POSIX) && !defined(__FreeBSD__)) && HAVE_MALLOC_H
-+#elif !defined(__OpenBSD__)
- #include <malloc.h>
- #else
- #include <stdlib.h> /* BS2000/OSD defines malloc() & friends in stdlib.h */
Index: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
===================================================================
RCS file: 5.6/patches/patch-ext_gd_libgd_gdkanji_c
diff -N 5.6/patches/patch-ext_gd_libgd_gdkanji_c
--- 5.6/patches/patch-ext_gd_libgd_gdkanji_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
-+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
-@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
- from_len = strlen ((const char *) from) + 1;
- to_len = BUFSIZ;
-
-- if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1)
-+ if ((int) iconv(cd, (const char **) &from, &from_len, (char **) &to, &to_len) == -1)
- {
- #ifdef HAVE_ERRNO_H
- if (errno == EINVAL)
Index: 5.6/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: 5.6/patches/patch-ext_iconv_iconv_c
diff -N 5.6/patches/patch-ext_iconv_iconv_c
--- 5.6/patches/patch-ext_iconv_iconv_c 12 Jul 2015 14:06:23 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2015/07/12 14:06:23 robert Exp $
---- ext/iconv/iconv.c.orig.port Fri Jul 10 02:33:32 2015
-+++ ext/iconv/iconv.c Sun Jul 12 16:05:11 2015
-@@ -463,7 +463,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
-
- out_p = (d)->c + (d)->len;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EINVAL:
-@@ -650,7 +650,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
- out_p = out_buf;
-
- while (in_left > 0) {
-- result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
-+ result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
- out_size = bsz - out_left;
- if (result == (size_t)(-1)) {
- if (ignore_ilseq && errno == EILSEQ) {
-@@ -775,7 +775,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
-
- prev_in_left = in_left;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- if (prev_in_left == in_left) {
- break;
- }
-@@ -896,7 +896,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr
-
- prev_in_left = in_left;
-
-- if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd1, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- if (prev_in_left == in_left) {
- break;
- }
-@@ -1028,7 +1028,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
-
- prev_in_left = in_left;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- if (prev_in_left == in_left) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
-@@ -1277,7 +1277,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
-
- out_left = out_size - out_reserved;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EINVAL:
-@@ -1377,7 +1377,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
- out_p = buf;
- out_left = out_size;
-
-- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
-+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EINVAL:
-@@ -2650,7 +2650,7 @@ static int php_iconv_stream_filter_append_bucket(
- tcnt = self->stub_len;
-
- while (tcnt > 0) {
-- if (iconv(self->cd, &pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
-+ if (iconv(self->cd, (const char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
- #if ICONV_SUPPORTS_ERRNO
- switch (errno) {
- case EILSEQ:
Index: 5.6/patches/patch-ext_mysqlnd_config9_m4
===================================================================
RCS file: 5.6/patches/patch-ext_mysqlnd_config9_m4
diff -N 5.6/patches/patch-ext_mysqlnd_config9_m4
--- 5.6/patches/patch-ext_mysqlnd_config9_m4 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/mysqlnd/config9.m4.orig.port Wed Jul 3 08:10:53 2013
-+++ ext/mysqlnd/config9.m4 Sat Jul 27 18:39:50 2013
-@@ -16,6 +16,7 @@ if test -z "$PHP_ZLIB_DIR"; then
- fi
-
- dnl If some extension uses mysqlnd it will get compiled in PHP core
-+PHP_MYSQLND_ENABLED="yes"
- if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
- mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
- mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
Index: 5.6/patches/patch-ext_openssl_config0_m4
===================================================================
RCS file: 5.6/patches/patch-ext_openssl_config0_m4
diff -N 5.6/patches/patch-ext_openssl_config0_m4
--- 5.6/patches/patch-ext_openssl_config0_m4 25 May 2018 13:59:19 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_openssl_config0_m4,v 1.3 2018/05/25 13:59:19 sthen Exp $
---- ext/openssl/config0.m4.orig.port Wed Apr 15 20:05:57 2015
-+++ ext/openssl/config0.m4 Sat Apr 25 18:10:11 2015
-@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
- PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
- fi
-
-- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
-+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
- AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
- AC_CHECK_FUNCS([RAND_egd])
-
Index: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
===================================================================
RCS file: 5.6/patches/patch-ext_sockets_sockaddr_conv_c
diff -N 5.6/patches/patch-ext_sockets_sockaddr_conv_c
--- 5.6/patches/patch-ext_sockets_sockaddr_conv_c 15 Nov 2014 13:43:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_sockets_sockaddr_conv_c,v 1.1 2014/11/15 13:43:01 robert Exp $
---- ext/sockets/sockaddr_conv.c.orig.port Wed Mar 5 10:18:00 2014
-+++ ext/sockets/sockaddr_conv.c Mon Mar 24 22:53:00 2014
-@@ -11,6 +11,10 @@
-
- extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC);
-
-+#if defined(__OpenBSD__)
-+#define AI_V4MAPPED 0
-+
Subscribe to:
Posts (Atom)