May 2016 - CRUX - lists.crux.nu

Translating PKGBUILDs into Pkgfiles
by crispyfrog＠163.com 30 May '16

30 May '16

Hi, I wrote some scripts to help crux users making new ports. Basically, it scraps the archlinux web pages to get the port files, and do the real translations with an awk script. It can sort out dependencies correctly. If you are interested, please check it out here: https://github.com/muphil/pkb2pkf Any comments are welcomed. - phi

1 0

ports/opt (3.2): [notify] chromium: updated to 51.0.2704.63
by crux＠crux.nu 28 May '16

28 May '16

commit 4265d87dd69cbbdf694eb63b69f441ef83e06f57 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Sat May 28 20:28:53 2016 +0200 [notify] chromium: updated to 51.0.2704.63 This update includes 42 security fixes: http://googlechromereleases.blogspot.com/2016/05/stable-channel-update_25.h… diff --git a/chromium/.footprint b/chromium/.footprint index 6f5cd1d..015ef52 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -55,7 +55,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/localStorage.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/notifications.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneAddButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneFilterButtons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneRefreshButtons.png @@ -99,9 +98,9 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarResizerVertical.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/touchCursor.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/touchCursor_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/updateServiceWorker.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/InspectorBackendCommands.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/SupportedCSSProperties.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Tests.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/accessibility_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/animation_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits_module.js @@ -139,17 +138,17 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices_module.js (EMPTY) +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/es_tree_module.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter_worker_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.html -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler_module.js --rw-r--r-- root/root usr/lib/chromium/resources/inspector/promises_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resources_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/screencast_module.js --rw-r--r-- root/root usr/lib/chromium/resources/inspector/script_formatter_worker_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/security_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/settings_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/snippets_module.js diff --git a/chromium/.md5sum b/chromium/.md5sum index 4b182cc..5c5a186 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,3 +1,3 @@ -5e8331ec278990157a39ee73c7b7bc3e chromium-50.0.2661.102.tar.xz +9a79774046fd15903335ecc88cf3e37f chromium-51.0.2704.63.tar.xz b527005e021b14869a669e42c46b661d chromium.desktop 64968626706b07721983ac59fb3babbf chromium.sh diff --git a/chromium/Pkgfile b/chromium/Pkgfile index a68ac8c..f8b0c7c 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,7 +5,7 @@ # Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm name=chromium -version=50.0.2661.102 +version=51.0.2704.63 release=1 source=(http://commondatastorage.googleapis.com/$name-browser-official/$nam… \ $name.sh $name.desktop)

1 0

ports/opt (3.2): [notify] php: update to 5.6.22
by crux＠crux.nu 27 May '16

27 May '16

commit abea35f2b5e27d75fd1ad8493c509827c4756f76 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 27 15:25:44 2016 +0200 [notify] php: update to 5.6.22 Security fixes, see http://php.net/ChangeLog-5.php#5.6.22 diff --git a/php/.md5sum b/php/.md5sum index c644067..f5fb18e 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1 +1 @@ -177c69d47024541739c439c9d9eb6ba5 php-5.6.21.tar.xz +19a5bcbddc105dfb29482ab779fcc795 php-5.6.22.tar.xz diff --git a/php/Pkgfile b/php/Pkgfile index 0945b01..9a36bdd 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline libpcre libxml2 curl db gdbm xz name=php -version=5.6.21 +version=5.6.22 release=1 source=(http://php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): [notify] qemu-all: fix several CVEs, patch taken from http://pkgs.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=f0208c9e
by crux＠crux.nu 27 May '16

27 May '16

commit 69115d988fa0fd545672b114dddec5f3ae264c7e Author: Thomas Penteker <tek(a)serverop.de> Date: Fri May 27 14:55:21 2016 +0200 [notify] qemu-all: fix several CVEs, patch taken from http://pkgs.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=f0208c9e diff --git a/qemu-all/.footprint b/qemu-all/.footprint old mode 100644 new mode 100755 index a01aede..ed050eb --- a/qemu-all/.footprint +++ b/qemu-all/.footprint @@ -145,11 +145,9 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/pxe-pcnet.rom -rw-r--r-- root/root usr/share/qemu/pxe-rtl8139.rom -rw-r--r-- root/root usr/share/qemu/pxe-virtio.rom --rw-r--r-- root/root usr/share/qemu/q35-acpi-dsdt.aml -rw-r--r-- root/root usr/share/qemu/qemu-icon.bmp -rw-r--r-- root/root usr/share/qemu/qemu_logo_no_text.svg -rw-r--r-- root/root usr/share/qemu/s390-ccw.img --rw-r--r-- root/root usr/share/qemu/s390-zipl.rom -rw-r--r-- root/root usr/share/qemu/sgabios.bin -rw-r--r-- root/root usr/share/qemu/slof.bin -rw-r--r-- root/root usr/share/qemu/spapr-rtas.bin @@ -158,8 +156,8 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/vgabios-cirrus.bin -rw-r--r-- root/root usr/share/qemu/vgabios-qxl.bin -rw-r--r-- root/root usr/share/qemu/vgabios-stdvga.bin --rw-r--r-- root/root usr/share/qemu/vgabios-vmware.bin -rw-r--r-- root/root usr/share/qemu/vgabios-virtio.bin +-rw-r--r-- root/root usr/share/qemu/vgabios-vmware.bin -rw-r--r-- root/root usr/share/qemu/vgabios.bin drwxr-xr-x root/root var/ drwxr-xr-x root/root var/run/ diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum old mode 100644 new mode 100755 index b2cd694..6d028da --- a/qemu-all/.md5sum +++ b/qemu-all/.md5sum @@ -1 +1,2 @@ -f5ff0e71398b9e428b4f177001ba4285 qemu-2.5.1.1.tar.bz2 +bae792f4cb7495f567390046a1ede1cb cve-2016-4020-4439-4441.diff +ca3f70b43f093e33e9e014f144067f13 qemu-2.6.0.tar.bz2 diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile old mode 100644 new mode 100755 index a06d680..3c4a5f6 --- a/qemu-all/Pkgfile +++ b/qemu-all/Pkgfile @@ -6,13 +6,15 @@ # Nice to have: libseccomp libiscsi libusb usbredir spice name=qemu-all -version=2.5.1.1 -release=1 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) +version=2.6.0 +release=2 +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 cve-2016-4020-4439-4441.diff) build() { cd qemu-$version + + patch -p1 -i $SRC/cve-2016-4020-4439-4441.diff ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ diff --git a/qemu-all/cve-2016-4020-4439-4441.diff b/qemu-all/cve-2016-4020-4439-4441.diff new file mode 100644 index 0000000..e203e9e --- /dev/null +++ b/qemu-all/cve-2016-4020-4439-4441.diff @@ -0,0 +1,294 @@ +--- a/hw/i386/kvmvapic.c ++++ b/hw/i386/kvmvapic.c +@@ -394,7 +394,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) + CPUX86State *env = &cpu->env; + VAPICHandlers *handlers; + uint8_t opcode[2]; +- uint32_t imm32; ++ uint32_t imm32 = 0; + target_ulong current_pc = 0; + target_ulong current_cs_base = 0; + int current_flags = 0; +--- a/hw/scsi/esp.c ++++ b/hw/scsi/esp.c +@@ -448,7 +448,11 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val) + break; + case ESP_FIFO: + if (s->do_cmd) { +- s->cmdbuf[s->cmdlen++] = val & 0xff; ++ if (s->cmdlen < TI_BUFSZ) { ++ s->cmdbuf[s->cmdlen++] = val & 0xff; ++ } else { ++ trace_esp_error_fifo_overrun(); ++ } + } else if (s->ti_size == TI_BUFSZ - 1) { + trace_esp_error_fifo_overrun(); + } else { +--- a/hw/scsi/esp.c ++++ b/hw/scsi/esp.c +@@ -82,7 +82,7 @@ void esp_request_cancelled(SCSIRequest *req) + } + } + +-static uint32_t get_cmd(ESPState *s, uint8_t *buf) ++static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t buflen) + { + uint32_t dmalen; + int target; +@@ -92,6 +92,9 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf) + dmalen = s->rregs[ESP_TCLO]; + dmalen |= s->rregs[ESP_TCMID] << 8; + dmalen |= s->rregs[ESP_TCHI] << 16; ++ if (dmalen > buflen) { ++ return 0; ++ } + s->dma_memory_read(s->dma_opaque, buf, dmalen); + } else { + dmalen = s->ti_size; +@@ -166,7 +169,7 @@ static void handle_satn(ESPState *s) + s->dma_cb = handle_satn; + return; + } +- len = get_cmd(s, buf); ++ len = get_cmd(s, buf, sizeof(buf)); + if (len) + do_cmd(s, buf); + } +@@ -180,7 +183,7 @@ static void handle_s_without_atn(ESPState *s) + s->dma_cb = handle_s_without_atn; + return; + } +- len = get_cmd(s, buf); ++ len = get_cmd(s, buf, sizeof(buf)); + if (len) { + do_busid_cmd(s, buf, 0); + } +@@ -192,7 +195,7 @@ static void handle_satn_stop(ESPState *s) + s->dma_cb = handle_satn_stop; + return; + } +- s->cmdlen = get_cmd(s, s->cmdbuf); ++ s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); + if (s->cmdlen) { + trace_esp_handle_satn_stop(s->cmdlen); + s->do_cmd = 1; +--- a/hw/display/vga.c ++++ b/hw/display/vga.c +@@ -149,6 +149,11 @@ static inline bool vbe_enabled(VGACommonState *s) + return s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED; + } + ++static inline uint8_t sr(VGACommonState *s, int idx) ++{ ++ return vbe_enabled(s) ? s->sr_vbe[idx] : s->sr[idx]; ++} ++ + static void vga_update_memory_access(VGACommonState *s) + { + hwaddr base, offset, size; +@@ -163,8 +168,8 @@ static void vga_update_memory_access(VGACommonState *s) + s->has_chain4_alias = false; + s->plane_updated = 0xf; + } +- if ((s->sr[VGA_SEQ_PLANE_WRITE] & VGA_SR02_ALL_PLANES) == +- VGA_SR02_ALL_PLANES && s->sr[VGA_SEQ_MEMORY_MODE] & VGA_SR04_CHN_4M) { ++ if ((sr(s, VGA_SEQ_PLANE_WRITE) & VGA_SR02_ALL_PLANES) == ++ VGA_SR02_ALL_PLANES && sr(s, VGA_SEQ_MEMORY_MODE) & VGA_SR04_CHN_4M) { + offset = 0; + switch ((s->gr[VGA_GFX_MISC] >> 2) & 3) { + case 0: +@@ -234,7 +239,7 @@ static void vga_precise_update_retrace_info(VGACommonState *s) + ((s->cr[VGA_CRTC_OVERFLOW] >> 6) & 2)) << 8); + vretr_end_line = s->cr[VGA_CRTC_V_SYNC_END] & 0xf; + +- clocking_mode = (s->sr[VGA_SEQ_CLOCK_MODE] >> 3) & 1; ++ clocking_mode = (sr(s, VGA_SEQ_CLOCK_MODE) >> 3) & 1; + clock_sel = (s->msr >> 2) & 3; + dots = (s->msr & 1) ? 8 : 9; + +@@ -486,7 +491,6 @@ void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) + printf("vga: write SR%x = 0x%02x\n", s->sr_index, val); + #endif + s->sr[s->sr_index] = val & sr_mask[s->sr_index]; +- vbe_update_vgaregs(s); + if (s->sr_index == VGA_SEQ_CLOCK_MODE) { + s->update_retrace_info(s); + } +@@ -680,13 +684,13 @@ static void vbe_update_vgaregs(VGACommonState *s) + + if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) { + shift_control = 0; +- s->sr[VGA_SEQ_CLOCK_MODE] &= ~8; /* no double line */ ++ s->sr_vbe[VGA_SEQ_CLOCK_MODE] &= ~8; /* no double line */ + } else { + shift_control = 2; + /* set chain 4 mode */ +- s->sr[VGA_SEQ_MEMORY_MODE] |= VGA_SR04_CHN_4M; ++ s->sr_vbe[VGA_SEQ_MEMORY_MODE] |= VGA_SR04_CHN_4M; + /* activate all planes */ +- s->sr[VGA_SEQ_PLANE_WRITE] |= VGA_SR02_ALL_PLANES; ++ s->sr_vbe[VGA_SEQ_PLANE_WRITE] |= VGA_SR02_ALL_PLANES; + } + s->gr[VGA_GFX_MODE] = (s->gr[VGA_GFX_MODE] & ~0x60) | + (shift_control << 5); +@@ -836,7 +840,7 @@ uint32_t vga_mem_readb(VGACommonState *s, hwaddr addr) + break; + } + +- if (s->sr[VGA_SEQ_MEMORY_MODE] & VGA_SR04_CHN_4M) { ++ if (sr(s, VGA_SEQ_MEMORY_MODE) & VGA_SR04_CHN_4M) { + /* chain 4 mode : simplest access */ + assert(addr < s->vram_size); + ret = s->vram_ptr[addr]; +@@ -904,11 +908,11 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) + break; + } + +- if (s->sr[VGA_SEQ_MEMORY_MODE] & VGA_SR04_CHN_4M) { ++ if (sr(s, VGA_SEQ_MEMORY_MODE) & VGA_SR04_CHN_4M) { + /* chain 4 mode : simplest access */ + plane = addr & 3; + mask = (1 << plane); +- if (s->sr[VGA_SEQ_PLANE_WRITE] & mask) { ++ if (sr(s, VGA_SEQ_PLANE_WRITE) & mask) { + assert(addr < s->vram_size); + s->vram_ptr[addr] = val; + #ifdef DEBUG_VGA_MEM +@@ -921,7 +925,7 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) + /* odd/even mode (aka text mode mapping) */ + plane = (s->gr[VGA_GFX_PLANE_READ] & 2) | (addr & 1); + mask = (1 << plane); +- if (s->sr[VGA_SEQ_PLANE_WRITE] & mask) { ++ if (sr(s, VGA_SEQ_PLANE_WRITE) & mask) { + addr = ((addr & ~1) << 1) | plane; + if (addr >= s->vram_size) { + return; +@@ -996,7 +1000,7 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) + + do_write: + /* mask data according to sr[2] */ +- mask = s->sr[VGA_SEQ_PLANE_WRITE]; ++ mask = sr(s, VGA_SEQ_PLANE_WRITE); + s->plane_updated |= mask; /* only used to detect font change */ + write_mask = mask16[mask]; + if (addr * sizeof(uint32_t) >= s->vram_size) { +@@ -1152,10 +1156,10 @@ static void vga_get_text_resolution(VGACommonState *s, int *pwidth, int *pheight + /* total width & height */ + cheight = (s->cr[VGA_CRTC_MAX_SCAN] & 0x1f) + 1; + cwidth = 8; +- if (!(s->sr[VGA_SEQ_CLOCK_MODE] & VGA_SR01_CHAR_CLK_8DOTS)) { ++ if (!(sr(s, VGA_SEQ_CLOCK_MODE) & VGA_SR01_CHAR_CLK_8DOTS)) { + cwidth = 9; + } +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 0x08) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 0x08) { + cwidth = 16; /* NOTE: no 18 pixel wide */ + } + width = (s->cr[VGA_CRTC_H_DISP] + 1); +@@ -1197,7 +1201,7 @@ static void vga_draw_text(VGACommonState *s, int full_update) + int64_t now = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); + + /* compute font data address (in plane 2) */ +- v = s->sr[VGA_SEQ_CHARACTER_MAP]; ++ v = sr(s, VGA_SEQ_CHARACTER_MAP); + offset = (((v >> 4) & 1) | ((v << 1) & 6)) * 8192 * 4 + 2; + if (offset != s->font_offsets[0]) { + s->font_offsets[0] = offset; +@@ -1506,11 +1510,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + } + + if (shift_control == 0) { +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + disp_width <<= 1; + } + } else if (shift_control == 1) { +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + disp_width <<= 1; + } + } +@@ -1574,7 +1578,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + + if (shift_control == 0) { + full_update |= update_palette16(s); +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + v = VGA_DRAW_LINE4D2; + } else { + v = VGA_DRAW_LINE4; +@@ -1582,7 +1586,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + bits = 4; + } else if (shift_control == 1) { + full_update |= update_palette16(s); +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + v = VGA_DRAW_LINE2D2; + } else { + v = VGA_DRAW_LINE2; +@@ -1629,7 +1633,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + #if 0 + printf("w=%d h=%d v=%d line_offset=%d cr[0x09]=0x%02x cr[0x17]=0x%02x linecmp=%d sr[0x01]=0x%02x\n", + width, height, v, line_offset, s->cr[9], s->cr[VGA_CRTC_MODE], +- s->line_compare, s->sr[VGA_SEQ_CLOCK_MODE]); ++ s->line_compare, sr(s, VGA_SEQ_CLOCK_MODE)); + #endif + addr1 = (s->start_addr * 4); + bwidth = (width * bits + 7) / 8; +@@ -1781,6 +1785,7 @@ void vga_common_reset(VGACommonState *s) + { + s->sr_index = 0; + memset(s->sr, '\0', sizeof(s->sr)); ++ memset(s->sr_vbe, '\0', sizeof(s->sr_vbe)); + s->gr_index = 0; + memset(s->gr, '\0', sizeof(s->gr)); + s->ar_index = 0; +@@ -1883,10 +1888,10 @@ static void vga_update_text(void *opaque, console_ch_t *chardata) + /* total width & height */ + cheight = (s->cr[VGA_CRTC_MAX_SCAN] & 0x1f) + 1; + cw = 8; +- if (!(s->sr[VGA_SEQ_CLOCK_MODE] & VGA_SR01_CHAR_CLK_8DOTS)) { ++ if (!(sr(s, VGA_SEQ_CLOCK_MODE) & VGA_SR01_CHAR_CLK_8DOTS)) { + cw = 9; + } +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 0x08) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 0x08) { + cw = 16; /* NOTE: no 18 pixel wide */ + } + width = (s->cr[VGA_CRTC_H_DISP] + 1); +@@ -2053,6 +2058,7 @@ static int vga_common_post_load(void *opaque, int version_id) + + /* force refresh */ + s->graphic_mode = -1; ++ vbe_update_vgaregs(s); + return 0; + } + +--- a/hw/display/vga_int.h ++++ b/hw/display/vga_int.h +@@ -98,6 +98,7 @@ typedef struct VGACommonState { + MemoryRegion chain4_alias; + uint8_t sr_index; + uint8_t sr[256]; ++ uint8_t sr_vbe[256]; + uint8_t gr_index; + uint8_t gr[256]; + uint8_t ar_index; +--- a/hw/arm/virt.c ++++ b/hw/arm/virt.c +@@ -1114,10 +1114,14 @@ static void machvirt_init(MachineState *machine) + * KVM is not available yet + */ + if (!gic_version) { ++ if (!kvm_enabled()) { ++ error_report("gic-version=host requires KVM"); ++ exit(1); ++ } ++ + gic_version = kvm_arm_vgic_probe(); + if (!gic_version) { + error_report("Unable to determine GIC version supported by host"); +- error_printf("KVM acceleration is probably not supported\n"); + exit(1); + } + }

1 0

ports/opt (3.2): [notify] qemu: fix several CVEs, patch taken from http://pkgs.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=f0208c9e
by crux＠crux.nu 27 May '16

27 May '16

commit 2cabb33df9d95cff8eb94a873477427cba70cc64 Author: Thomas Penteker <tek(a)serverop.de> Date: Fri May 27 13:44:09 2016 +0200 [notify] qemu: fix several CVEs, patch taken from http://pkgs.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=f0208c9e diff --git a/qemu/.md5sum b/qemu/.md5sum index 263e4bc..6d028da 100644 --- a/qemu/.md5sum +++ b/qemu/.md5sum @@ -1 +1,2 @@ +bae792f4cb7495f567390046a1ede1cb cve-2016-4020-4439-4441.diff ca3f70b43f093e33e9e014f144067f13 qemu-2.6.0.tar.bz2 diff --git a/qemu/Pkgfile b/qemu/Pkgfile index d048e95..c7cfa4b 100644 --- a/qemu/Pkgfile +++ b/qemu/Pkgfile @@ -7,13 +7,15 @@ name=qemu version=2.6.0 -release=1 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) +release=2 +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 cve-2016-4020-4439-4441.diff) build() { cd $name-$version + patch -p1 -i $SRC/cve-2016-4020-4439-4441.diff + ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ --host-cc="${CC:=gcc}" \ diff --git a/qemu/cve-2016-4020-4439-4441.diff b/qemu/cve-2016-4020-4439-4441.diff new file mode 100644 index 0000000..e203e9e --- /dev/null +++ b/qemu/cve-2016-4020-4439-4441.diff @@ -0,0 +1,294 @@ +--- a/hw/i386/kvmvapic.c ++++ b/hw/i386/kvmvapic.c +@@ -394,7 +394,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) + CPUX86State *env = &cpu->env; + VAPICHandlers *handlers; + uint8_t opcode[2]; +- uint32_t imm32; ++ uint32_t imm32 = 0; + target_ulong current_pc = 0; + target_ulong current_cs_base = 0; + int current_flags = 0; +--- a/hw/scsi/esp.c ++++ b/hw/scsi/esp.c +@@ -448,7 +448,11 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val) + break; + case ESP_FIFO: + if (s->do_cmd) { +- s->cmdbuf[s->cmdlen++] = val & 0xff; ++ if (s->cmdlen < TI_BUFSZ) { ++ s->cmdbuf[s->cmdlen++] = val & 0xff; ++ } else { ++ trace_esp_error_fifo_overrun(); ++ } + } else if (s->ti_size == TI_BUFSZ - 1) { + trace_esp_error_fifo_overrun(); + } else { +--- a/hw/scsi/esp.c ++++ b/hw/scsi/esp.c +@@ -82,7 +82,7 @@ void esp_request_cancelled(SCSIRequest *req) + } + } + +-static uint32_t get_cmd(ESPState *s, uint8_t *buf) ++static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t buflen) + { + uint32_t dmalen; + int target; +@@ -92,6 +92,9 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf) + dmalen = s->rregs[ESP_TCLO]; + dmalen |= s->rregs[ESP_TCMID] << 8; + dmalen |= s->rregs[ESP_TCHI] << 16; ++ if (dmalen > buflen) { ++ return 0; ++ } + s->dma_memory_read(s->dma_opaque, buf, dmalen); + } else { + dmalen = s->ti_size; +@@ -166,7 +169,7 @@ static void handle_satn(ESPState *s) + s->dma_cb = handle_satn; + return; + } +- len = get_cmd(s, buf); ++ len = get_cmd(s, buf, sizeof(buf)); + if (len) + do_cmd(s, buf); + } +@@ -180,7 +183,7 @@ static void handle_s_without_atn(ESPState *s) + s->dma_cb = handle_s_without_atn; + return; + } +- len = get_cmd(s, buf); ++ len = get_cmd(s, buf, sizeof(buf)); + if (len) { + do_busid_cmd(s, buf, 0); + } +@@ -192,7 +195,7 @@ static void handle_satn_stop(ESPState *s) + s->dma_cb = handle_satn_stop; + return; + } +- s->cmdlen = get_cmd(s, s->cmdbuf); ++ s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); + if (s->cmdlen) { + trace_esp_handle_satn_stop(s->cmdlen); + s->do_cmd = 1; +--- a/hw/display/vga.c ++++ b/hw/display/vga.c +@@ -149,6 +149,11 @@ static inline bool vbe_enabled(VGACommonState *s) + return s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED; + } + ++static inline uint8_t sr(VGACommonState *s, int idx) ++{ ++ return vbe_enabled(s) ? s->sr_vbe[idx] : s->sr[idx]; ++} ++ + static void vga_update_memory_access(VGACommonState *s) + { + hwaddr base, offset, size; +@@ -163,8 +168,8 @@ static void vga_update_memory_access(VGACommonState *s) + s->has_chain4_alias = false; + s->plane_updated = 0xf; + } +- if ((s->sr[VGA_SEQ_PLANE_WRITE] & VGA_SR02_ALL_PLANES) == +- VGA_SR02_ALL_PLANES && s->sr[VGA_SEQ_MEMORY_MODE] & VGA_SR04_CHN_4M) { ++ if ((sr(s, VGA_SEQ_PLANE_WRITE) & VGA_SR02_ALL_PLANES) == ++ VGA_SR02_ALL_PLANES && sr(s, VGA_SEQ_MEMORY_MODE) & VGA_SR04_CHN_4M) { + offset = 0; + switch ((s->gr[VGA_GFX_MISC] >> 2) & 3) { + case 0: +@@ -234,7 +239,7 @@ static void vga_precise_update_retrace_info(VGACommonState *s) + ((s->cr[VGA_CRTC_OVERFLOW] >> 6) & 2)) << 8); + vretr_end_line = s->cr[VGA_CRTC_V_SYNC_END] & 0xf; + +- clocking_mode = (s->sr[VGA_SEQ_CLOCK_MODE] >> 3) & 1; ++ clocking_mode = (sr(s, VGA_SEQ_CLOCK_MODE) >> 3) & 1; + clock_sel = (s->msr >> 2) & 3; + dots = (s->msr & 1) ? 8 : 9; + +@@ -486,7 +491,6 @@ void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) + printf("vga: write SR%x = 0x%02x\n", s->sr_index, val); + #endif + s->sr[s->sr_index] = val & sr_mask[s->sr_index]; +- vbe_update_vgaregs(s); + if (s->sr_index == VGA_SEQ_CLOCK_MODE) { + s->update_retrace_info(s); + } +@@ -680,13 +684,13 @@ static void vbe_update_vgaregs(VGACommonState *s) + + if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) { + shift_control = 0; +- s->sr[VGA_SEQ_CLOCK_MODE] &= ~8; /* no double line */ ++ s->sr_vbe[VGA_SEQ_CLOCK_MODE] &= ~8; /* no double line */ + } else { + shift_control = 2; + /* set chain 4 mode */ +- s->sr[VGA_SEQ_MEMORY_MODE] |= VGA_SR04_CHN_4M; ++ s->sr_vbe[VGA_SEQ_MEMORY_MODE] |= VGA_SR04_CHN_4M; + /* activate all planes */ +- s->sr[VGA_SEQ_PLANE_WRITE] |= VGA_SR02_ALL_PLANES; ++ s->sr_vbe[VGA_SEQ_PLANE_WRITE] |= VGA_SR02_ALL_PLANES; + } + s->gr[VGA_GFX_MODE] = (s->gr[VGA_GFX_MODE] & ~0x60) | + (shift_control << 5); +@@ -836,7 +840,7 @@ uint32_t vga_mem_readb(VGACommonState *s, hwaddr addr) + break; + } + +- if (s->sr[VGA_SEQ_MEMORY_MODE] & VGA_SR04_CHN_4M) { ++ if (sr(s, VGA_SEQ_MEMORY_MODE) & VGA_SR04_CHN_4M) { + /* chain 4 mode : simplest access */ + assert(addr < s->vram_size); + ret = s->vram_ptr[addr]; +@@ -904,11 +908,11 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) + break; + } + +- if (s->sr[VGA_SEQ_MEMORY_MODE] & VGA_SR04_CHN_4M) { ++ if (sr(s, VGA_SEQ_MEMORY_MODE) & VGA_SR04_CHN_4M) { + /* chain 4 mode : simplest access */ + plane = addr & 3; + mask = (1 << plane); +- if (s->sr[VGA_SEQ_PLANE_WRITE] & mask) { ++ if (sr(s, VGA_SEQ_PLANE_WRITE) & mask) { + assert(addr < s->vram_size); + s->vram_ptr[addr] = val; + #ifdef DEBUG_VGA_MEM +@@ -921,7 +925,7 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) + /* odd/even mode (aka text mode mapping) */ + plane = (s->gr[VGA_GFX_PLANE_READ] & 2) | (addr & 1); + mask = (1 << plane); +- if (s->sr[VGA_SEQ_PLANE_WRITE] & mask) { ++ if (sr(s, VGA_SEQ_PLANE_WRITE) & mask) { + addr = ((addr & ~1) << 1) | plane; + if (addr >= s->vram_size) { + return; +@@ -996,7 +1000,7 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) + + do_write: + /* mask data according to sr[2] */ +- mask = s->sr[VGA_SEQ_PLANE_WRITE]; ++ mask = sr(s, VGA_SEQ_PLANE_WRITE); + s->plane_updated |= mask; /* only used to detect font change */ + write_mask = mask16[mask]; + if (addr * sizeof(uint32_t) >= s->vram_size) { +@@ -1152,10 +1156,10 @@ static void vga_get_text_resolution(VGACommonState *s, int *pwidth, int *pheight + /* total width & height */ + cheight = (s->cr[VGA_CRTC_MAX_SCAN] & 0x1f) + 1; + cwidth = 8; +- if (!(s->sr[VGA_SEQ_CLOCK_MODE] & VGA_SR01_CHAR_CLK_8DOTS)) { ++ if (!(sr(s, VGA_SEQ_CLOCK_MODE) & VGA_SR01_CHAR_CLK_8DOTS)) { + cwidth = 9; + } +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 0x08) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 0x08) { + cwidth = 16; /* NOTE: no 18 pixel wide */ + } + width = (s->cr[VGA_CRTC_H_DISP] + 1); +@@ -1197,7 +1201,7 @@ static void vga_draw_text(VGACommonState *s, int full_update) + int64_t now = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); + + /* compute font data address (in plane 2) */ +- v = s->sr[VGA_SEQ_CHARACTER_MAP]; ++ v = sr(s, VGA_SEQ_CHARACTER_MAP); + offset = (((v >> 4) & 1) | ((v << 1) & 6)) * 8192 * 4 + 2; + if (offset != s->font_offsets[0]) { + s->font_offsets[0] = offset; +@@ -1506,11 +1510,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + } + + if (shift_control == 0) { +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + disp_width <<= 1; + } + } else if (shift_control == 1) { +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + disp_width <<= 1; + } + } +@@ -1574,7 +1578,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + + if (shift_control == 0) { + full_update |= update_palette16(s); +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + v = VGA_DRAW_LINE4D2; + } else { + v = VGA_DRAW_LINE4; +@@ -1582,7 +1586,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + bits = 4; + } else if (shift_control == 1) { + full_update |= update_palette16(s); +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 8) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 8) { + v = VGA_DRAW_LINE2D2; + } else { + v = VGA_DRAW_LINE2; +@@ -1629,7 +1633,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) + #if 0 + printf("w=%d h=%d v=%d line_offset=%d cr[0x09]=0x%02x cr[0x17]=0x%02x linecmp=%d sr[0x01]=0x%02x\n", + width, height, v, line_offset, s->cr[9], s->cr[VGA_CRTC_MODE], +- s->line_compare, s->sr[VGA_SEQ_CLOCK_MODE]); ++ s->line_compare, sr(s, VGA_SEQ_CLOCK_MODE)); + #endif + addr1 = (s->start_addr * 4); + bwidth = (width * bits + 7) / 8; +@@ -1781,6 +1785,7 @@ void vga_common_reset(VGACommonState *s) + { + s->sr_index = 0; + memset(s->sr, '\0', sizeof(s->sr)); ++ memset(s->sr_vbe, '\0', sizeof(s->sr_vbe)); + s->gr_index = 0; + memset(s->gr, '\0', sizeof(s->gr)); + s->ar_index = 0; +@@ -1883,10 +1888,10 @@ static void vga_update_text(void *opaque, console_ch_t *chardata) + /* total width & height */ + cheight = (s->cr[VGA_CRTC_MAX_SCAN] & 0x1f) + 1; + cw = 8; +- if (!(s->sr[VGA_SEQ_CLOCK_MODE] & VGA_SR01_CHAR_CLK_8DOTS)) { ++ if (!(sr(s, VGA_SEQ_CLOCK_MODE) & VGA_SR01_CHAR_CLK_8DOTS)) { + cw = 9; + } +- if (s->sr[VGA_SEQ_CLOCK_MODE] & 0x08) { ++ if (sr(s, VGA_SEQ_CLOCK_MODE) & 0x08) { + cw = 16; /* NOTE: no 18 pixel wide */ + } + width = (s->cr[VGA_CRTC_H_DISP] + 1); +@@ -2053,6 +2058,7 @@ static int vga_common_post_load(void *opaque, int version_id) + + /* force refresh */ + s->graphic_mode = -1; ++ vbe_update_vgaregs(s); + return 0; + } + +--- a/hw/display/vga_int.h ++++ b/hw/display/vga_int.h +@@ -98,6 +98,7 @@ typedef struct VGACommonState { + MemoryRegion chain4_alias; + uint8_t sr_index; + uint8_t sr[256]; ++ uint8_t sr_vbe[256]; + uint8_t gr_index; + uint8_t gr[256]; + uint8_t ar_index; +--- a/hw/arm/virt.c ++++ b/hw/arm/virt.c +@@ -1114,10 +1114,14 @@ static void machvirt_init(MachineState *machine) + * KVM is not available yet + */ + if (!gic_version) { ++ if (!kvm_enabled()) { ++ error_report("gic-version=host requires KVM"); ++ exit(1); ++ } ++ + gic_version = kvm_arm_vgic_probe(); + if (!gic_version) { + error_report("Unable to determine GIC version supported by host"); +- error_printf("KVM acceleration is probably not supported\n"); + exit(1); + } + }

1 0

Easier patching with pkgmk
by Willy Goiffon 26 May '16

26 May '16

Hi everyone, I had an idea to make software patching easier, and lower the need to fork ports. Sometimes, I just fork some port from contrib because I want to add a patch (eg: thttpd), or I need to modify a file before actually compiling the software (eg: config.h on contrib/st). I figured out that by adding a single variable to `/etc/pkgmk.conf`, it would be easier to "tweak" sofwares by patching them beforehand: ``` /etc/pkgmk.conf [...] PKGMK_PATCH_DIR=/usr/patch And then, have ports include something like: ``` /usr/port/contrib/example/PKgfile [...] cd $name-$version cat $PKGMK_PATCH_DIR/$name/*.diff | patch -Np1 make make DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man install So if I need a patch for thttpd, I'll just add it to `/usr/patch/thttpd`. To have the `st` port configured with my `config.h`, I'll just create a patch for it in `/usr/patch/st`. All ports might not need this obviously, but this could result in a simple and efficient way to let user tweak packages from the "official" port trees without any need to actually fork them, and double the effort. What do you think about it? -- Willy Goiffon (z3bra on #crux)

5 6

Re: Cannot Connect to Internet
by Ilya Solovyov 23 May '16

23 May '16

Have any changes been made in /etc/rc.d/{net,wlan}?

3 4

Cannot Connect to Internet
by Dutch Ingraham 23 May '16

23 May '16

Hi all: After a recent update, I cannot connect to the internet. My most recent update was on May 16 and consisted of updates to: dhcpcd file libdevmapper lvm spectrwm xorg-xproto Today (the first time I have rebooted the machine since that update), I cannot connect to the internet. I apparently have a good network connection: ~ $ ifconfig enp0s25 Link encap:Ethernet HWaddr 00:1E:4F:B0:F4:DA inet addr:169.254.169.134 Bcast:169.254.255.255 Mask:255.255.0.0 UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:40671 errors:0 dropped:0 overruns:0 frame:0 TX packets:1309 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:2721326 TX bytes:217356 Interrupt:21 Memory:fe9e0000-fea00000 lo Link encap:Local Loopback inet addr:127.0.0.1 Bcast:127.255.255.255 Mask:255.0.0.0 UP LOOPBACK RUNNING MTU:65536 Metric:1 RX packets:103 errors:0 dropped:0 overruns:0 frame:0 TX packets:103 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:7184 TX bytes:7184 Packets seem to be flowing in and out without error. However, a ping will return "Destination Host Unreachable." Same with a dig. So, I took a look at /etc/resolve.conf, which is automatically generated by dhcpcd. That file is empty, or more precisely, just contains the statement that it is automatically generated and two commented-out lines for head and tail files. I'm not sure why it is empty, as all my other Linux systems using dhcpcd have domain and nameserver entries. So, I manually added the entries, which (1) had no effect, and (2) were promptly overwritten. I have also disabled my firewall, which also had no effect. I'm sure I'm missing something obvious. Could someone hit me with a cluestick? Thanks.

2 2

ports/opt (3.2): [notify] libxml2: update to 2.9.4
by crux＠crux.nu 23 May '16

23 May '16

commit d435cc47f2702a03a735d1eb1ec8bf02f42cd8fe Author: Juergen Daubert <jue(a)jue.li> Date: Mon May 23 11:10:06 2016 +0200 [notify] libxml2: update to 2.9.4 security fixes, see https://mail.gnome.org/archives/xml/2016-May/msg00023.html diff --git a/libxml2/.footprint b/libxml2/.footprint index 57d5c50..96990c6 100644 --- a/libxml2/.footprint +++ b/libxml2/.footprint @@ -59,9 +59,9 @@ drwxr-xr-x root/root usr/lib/cmake/libxml2/ -rw-r--r-- root/root usr/lib/cmake/libxml2/libxml2-config.cmake -rw-r--r-- root/root usr/lib/libxml2.a -rwxr-xr-x root/root usr/lib/libxml2.la -lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.9.3 -lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.9.3 --rwxr-xr-x root/root usr/lib/libxml2.so.2.9.3 +lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.9.4 +lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.9.4 +-rwxr-xr-x root/root usr/lib/libxml2.so.2.9.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libxml-2.0.pc -rw-r--r-- root/root usr/lib/xml2Conf.sh diff --git a/libxml2/.md5sum b/libxml2/.md5sum index 8ad103b..a61d850 100644 --- a/libxml2/.md5sum +++ b/libxml2/.md5sum @@ -1 +1 @@ -daece17e045f1c107610e137ab50c179 libxml2-2.9.3.tar.gz +ae249165c173b1ff386ee8ad676815f5 libxml2-2.9.4.tar.gz diff --git a/libxml2/Pkgfile b/libxml2/Pkgfile index bbb8253..587b636 100644 --- a/libxml2/Pkgfile +++ b/libxml2/Pkgfile @@ -5,7 +5,7 @@ # Depends on: zlib name=libxml2 -version=2.9.3 +version=2.9.4 release=1 source=(ftp://xmlsoft.org/libxml2/$name-$version.tar.gz)

1 0

ports/opt (3.2): [notify] php: update to 5.6.21
by crux＠crux.nu 21 May '16

21 May '16

commit a9f7abdb5c841e6f00f926a69104e5093562c949 Author: Juergen Daubert <jue(a)jue.li> Date: Sat May 21 12:39:19 2016 +0200 [notify] php: update to 5.6.21 Security release, see http://www.php.net/ChangeLog-5.php#5.6.21 diff --git a/php/.md5sum b/php/.md5sum index 9605124..c644067 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1 +1 @@ -e81f3993997acafeac2ddd2c8bab7153 php-5.6.20.tar.xz +177c69d47024541739c439c9d9eb6ba5 php-5.6.21.tar.xz diff --git a/php/Pkgfile b/php/Pkgfile index d717f6e..0945b01 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline libpcre libxml2 curl db gdbm xz name=php -version=5.6.20 +version=5.6.21 release=1 source=(http://php.net/distributions/php-$version.tar.xz)

1 0