May 2016 - crux-commits - lists.crux.nu

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): unison: update to 2.48.4
by crux＠crux.nu 27 May '16

27 May '16

commit 664cc68d0c63cee2438d416db61434f5d17cf92a Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 27 15:30:50 2016 +0200 unison: update to 2.48.4 diff --git a/unison/.md5sum b/unison/.md5sum index b6c7bbb..4783036 100644 --- a/unison/.md5sum +++ b/unison/.md5sum @@ -1,2 +1 @@ -7cdb48c81f06304a0fd6f6c6479d90ce ocaml-4.03.patch -91ff2ef4141aede9af719fdd5e848bcb unison-2.48.3.tar.gz +5334b78c7e68169df7de95f4c6c4b60f unison-2.48.4.tar.gz diff --git a/unison/Pkgfile b/unison/Pkgfile index 7e7f100..d5a29b7 100644 --- a/unison/Pkgfile +++ b/unison/Pkgfile @@ -5,14 +5,12 @@ # Depends on: ocaml name=unison -version=2.48.3 -release=2 -source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$name-$version.tar.gz - ocaml-4.03.patch) +version=2.48.4 +release=1 +source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$name-$version.tar.gz) build() { - cd $name-$version - patch -p2 -i $SRC/ocaml-4.03.patch + cd src unset CFLAGS CXXFLAGS make -j1 UISTYLE=text THREADS=true NATIVE=true unison unison-fsmonitor install -d $PKG/usr/bin diff --git a/unison/ocaml-4.03.patch b/unison/ocaml-4.03.patch deleted file mode 100644 index a15ca0e..0000000 --- a/unison/ocaml-4.03.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 4473822b5aa6de3e849ca6c958b365a71edbca4f -Author: Benjamin Pierce <bcpierce00(a)gmail.com> -Date: Sat May 14 11:28:49 2016 -0400 - - Fix build for OCaml 4.03.0 - -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 22b5b6c..b9a4cef 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -57,7 +57,8 @@ let opendir f = - let readdir = Unix.readdir - let closedir = Unix.closedir - let readlink = Unix.readlink --let symlink = Unix.symlink -+(* BCP 5/16: Eta-expand for backward compatibility with OCaml <=4.02 *) -+let symlink s1 s2 = Unix.symlink s1 s2 - let chdir = Sys.chdir - let getcwd = Sys.getcwd -

1 0

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

27 May '16

commit 53f6992d677e87bb4a70851073568032870f25d6 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 27 15:29:36 2016 +0200 php-gd: update to 5.6.22 diff --git a/php-gd/.md5sum b/php-gd/.md5sum index c644067..f5fb18e 100644 --- a/php-gd/.md5sum +++ b/php-gd/.md5sum @@ -1 +1 @@ -177c69d47024541739c439c9d9eb6ba5 php-5.6.21.tar.xz +19a5bcbddc105dfb29482ab779fcc795 php-5.6.22.tar.xz diff --git a/php-gd/Pkgfile b/php-gd/Pkgfile index e09039e..4bb198d 100644 --- a/php-gd/Pkgfile +++ b/php-gd/Pkgfile @@ -5,7 +5,7 @@ # Depends on: libgd name=php-gd -version=5.6.21 +version=5.6.22 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): mod_php: update to 5.6.22
by crux＠crux.nu 27 May '16

27 May '16

commit fb141341213ace1cb6dc17de8f62df5dbfd668ac Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 27 15:28:47 2016 +0200 mod_php: update to 5.6.22 diff --git a/mod_php/.md5sum b/mod_php/.md5sum index c644067..f5fb18e 100644 --- a/mod_php/.md5sum +++ b/mod_php/.md5sum @@ -1 +1 @@ -177c69d47024541739c439c9d9eb6ba5 php-5.6.21.tar.xz +19a5bcbddc105dfb29482ab779fcc795 php-5.6.22.tar.xz diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index 5ada9c5..f7375e3 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xz apache libxml2 name=mod_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): spectrwm: update to 3.0.2
by crux＠crux.nu 27 May '16

27 May '16

commit 3d69876ec8da51cc954ac38d9869f2e34b3ed96c Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 27 14:52:29 2016 +0200 spectrwm: update to 3.0.2 diff --git a/spectrwm/.md5sum b/spectrwm/.md5sum index 5ee53e7..80d2dce 100644 --- a/spectrwm/.md5sum +++ b/spectrwm/.md5sum @@ -1,2 +1,2 @@ -4df6713ad2bea95431e07317573baf0f SPECTRWM_3_0_1.tar.gz -a9d07e98d8536bde4c37c0d6a726d93d spectrwm-remove_libswmhack.patch +b95af7630bfc1cae4de07286ac7e2318 SPECTRWM_3_0_2.tar.gz +7090cd60f503116e9a7bc8c7bb71e616 spectrwm-remove_libswmhack.patch diff --git a/spectrwm/Pkgfile b/spectrwm/Pkgfile index 1415cdf..eb899b2 100644 --- a/spectrwm/Pkgfile +++ b/spectrwm/Pkgfile @@ -1,10 +1,10 @@ # Description: Minimalistic tiling window manager # URL: https://opensource.conformal.com/wiki/spectrwm # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: xorg-libxrender fontconfig xorg-xcb-util-keysyms xorg-xcb-util-wm +# Depends on: xorg-libxcursor xorg-libxft xorg-xcb-util-keysyms xorg-xcb-util-wm name=spectrwm -version=3.0.1 +version=3.0.2 release=1 source=(https://github.com/conformal/spectrwm/archive/SPECTRWM_${version//.… $name-remove_libswmhack.patch) diff --git a/spectrwm/spectrwm-remove_libswmhack.patch b/spectrwm/spectrwm-remove_libswmhack.patch index 7e6c2ee..27d2483 100644 --- a/spectrwm/spectrwm-remove_libswmhack.patch +++ b/spectrwm/spectrwm-remove_libswmhack.patch @@ -1,7 +1,7 @@ -diff -Nru spectrwm-3.0.1.orig/linux/Makefile spectrwm-3.0.1/linux/Makefile ---- spectrwm-3.0.1.orig/linux/Makefile 2016-05-16 15:22:06.375506421 +0200 -+++ spectrwm-3.0.1/linux/Makefile 2016-05-16 15:27:15.595398541 +0200 -@@ -10,7 +10,7 @@ +diff -Nru spectrwm-3.0.2.orig/linux/Makefile spectrwm-3.0.2/linux/Makefile +--- spectrwm-3.0.2.orig/linux/Makefile 2016-05-24 11:53:05.831647479 +0200 ++++ spectrwm-3.0.2/linux/Makefile 2016-05-24 11:57:34.912071921 +0200 +@@ -10,14 +10,14 @@ LIBMAJORVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major) MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g @@ -10,9 +10,17 @@ diff -Nru spectrwm-3.0.1.orig/linux/Makefile spectrwm-3.0.1/linux/Makefile MAINT_LDLIBS = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor ifneq ("${BUILDVERSION}", "") -diff -Nru spectrwm-3.0.1.orig/spectrwm.c spectrwm-3.0.1/spectrwm.c ---- spectrwm-3.0.1.orig/spectrwm.c 2016-05-16 15:22:06.378839754 +0200 -+++ spectrwm-3.0.1/spectrwm.c 2016-05-16 15:30:08.021987775 +0200 + MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" + endif + +-all: spectrwm libswmhack.so.$(LIBVERSION) ++all: spectrwm + + spectrwm: spectrwm.o linux.o + $(CC) $(MAINT_LDFLAGS) $(LDFLAGS) -o $@ $+ $(MAINT_LDLIBS) $(LDLIBS) +diff -Nru spectrwm-3.0.2.orig/spectrwm.c spectrwm-3.0.2/spectrwm.c +--- spectrwm-3.0.2.orig/spectrwm.c 2016-05-24 11:53:05.831647479 +0200 ++++ spectrwm-3.0.2/spectrwm.c 2016-05-24 11:57:03.713195913 +0200 @@ -273,9 +273,9 @@ #define SWM_CONF_DEFAULT (0) #define SWM_CONF_KEYMAPPING (1)

1 0

ports/opt (3.2): scite: update to 3.6.6
by crux＠crux.nu 27 May '16

27 May '16

commit 09afb6ef293486eec26481c67cff3836373e3b9d Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 27 14:51:49 2016 +0200 scite: update to 3.6.6 diff --git a/scite/.md5sum b/scite/.md5sum index edee4b3..92b88e1 100644 --- a/scite/.md5sum +++ b/scite/.md5sum @@ -1 +1 @@ -1c4ce5aa0370b1bbc535b80d38f738a2 scite365.tgz +7319d63df9f59e377aaae18d976daf42 scite366.tgz diff --git a/scite/Pkgfile b/scite/Pkgfile index 819b7ed..82e307a 100644 --- a/scite/Pkgfile +++ b/scite/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk name=scite -version=3.6.5 +version=3.6.6 release=1 source=(http://downloads.sourceforge.net/project/scintilla/SciTE/$version/$…

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

ports/contrib (3.2): mercurial: 3.7.1 -> 3.8.2
by crux＠crux.nu 27 May '16

27 May '16

commit 3ff14f524a70525b37e90fcdd12de2efc1eb7560 Author: Thomas Penteker <tek(a)serverop.de> Date: Fri May 27 13:13:51 2016 +0200 mercurial: 3.7.1 -> 3.8.2 diff --git a/mercurial/.footprint b/mercurial/.footprint index 3aaf1dc..0f583ba 100644 --- a/mercurial/.footprint +++ b/mercurial/.footprint @@ -9,6 +9,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/acl.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/acl.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/automv.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/automv.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/blackbox.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/blackbox.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/bugzilla.py @@ -64,6 +66,21 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/convert/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/factotum.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fetch.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fetch.pyc +drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/__init__.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/__init__.pyc +drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/__init__.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/__init__.pyc +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/bser.so +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/capabilities.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/capabilities.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/pybser.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/pybser.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/state.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/state.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/watchmanclient.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/fsmonitor/watchmanclient.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/gpg.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/gpg.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/graphlog.py @@ -104,6 +121,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/largefiles/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/largefiles/uisetup.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/largefiles/wirestore.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/largefiles/wirestore.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/logtoprocess.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/logtoprocess.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/mq.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/mq.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/notify.py @@ -139,10 +158,15 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/zeroconf/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/Zeroconf.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial-3.7.1-py2.7.egg-info +drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext3rd/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext3rd/__init__.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext3rd/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial-3.8.2-py2.7.egg-info drwxr-xr-x root/root usr/lib/python2.7/site-packages/mercurial/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__modulepolicy__.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__modulepolicy__.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__version__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__version__.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/ancestor.py @@ -230,6 +254,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/mercurial/help/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/extensions.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/filesets.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/glossary.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/hg-ssh.8.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/hg.1.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/hgignore.5.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/hgignore.txt @@ -238,6 +263,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/mercurial/help/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/mercurial/help/internals/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/internals/bundles.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/internals/changegroups.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/internals/requirements.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/internals/revlogs.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/merge-tools.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/help/multirevs.txt @@ -353,6 +379,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/mercurial/pure/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/pvec.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/py3kcompat.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/py3kcompat.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/pycompat.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/pycompat.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/registrar.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/registrar.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/repair.py diff --git a/mercurial/.md5sum b/mercurial/.md5sum index b1e6723..2f83d0f 100644 --- a/mercurial/.md5sum +++ b/mercurial/.md5sum @@ -1 +1 @@ -4e922fcc9454d2665f20c3b9b4741add mercurial-3.7.1.tar.gz +c38daa0cbe264fc621dc3bb05933b0b3 mercurial-3.8.2.tar.gz diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile index cdfdc77..7001b93 100644 --- a/mercurial/Pkgfile +++ b/mercurial/Pkgfile @@ -5,9 +5,9 @@ # Depends on: python name=mercurial -version=3.7.1 +version=3.8.2 release=1 -source=(http://www.selenic.com/$name/release/$name-$version.tar.gz) +source=(http://mercurial.selenic.com/release/mercurial-$version.tar.gz) build() { cd $name-$version

1 0

ports/opt (3.2): git: 2.8.0 -> 2.8.3
by crux＠crux.nu 27 May '16

27 May '16

commit 3a1b8ae4a0bf1f90fc5a2857e2fba482072619f7 Author: Thomas Penteker <tek(a)serverop.de> Date: Fri May 27 13:13:31 2016 +0200 git: 2.8.0 -> 2.8.3 diff --git a/git/.md5sum b/git/.md5sum index a31a875..383e200 100644 --- a/git/.md5sum +++ b/git/.md5sum @@ -1,3 +1,3 @@ b423b29027071b520ed95af5639c16d5 git -01477f0b97ccab20b986f2808f4d7a97 git-2.8.0.tar.xz -d67a7db0f363e8c3b2960cd84ad0373f git-manpages-2.8.0.tar.xz +4a9bda9f14e9c5ce3e7a416e43b74a1b git-2.8.3.tar.xz +553827e1b6c422ecc485499c1a1ae28d git-manpages-2.8.3.tar.xz diff --git a/git/Pkgfile b/git/Pkgfile index 2df4c20..919b426 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -6,8 +6,8 @@ # Nice to have: tk name=git -version=2.8.0 -release=2 +version=2.8.3 +release=1 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$versio… git)

1 0