Page MenuHomeFreeBSD
Differential D15965

x11/polybar: Fix build against x11/xcb-proto 1.13.
ClosedPublic
Actions

Authored by rigoletto on Jun 22 2018, 1:48 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 22, 4:46 AM
Unknown Object (File)
Sun, Mar 16, 2:32 PM
Unknown Object (File)
Tue, Mar 4, 11:22 AM
Unknown Object (File)
Sat, Mar 1, 1:53 PM
Unknown Object (File)
Fri, Feb 28, 7:44 PM
Unknown Object (File)
Fri, Feb 28, 1:59 PM
Unknown Object (File)
Tue, Feb 25, 3:03 PM
Unknown Object (File)
Mon, Feb 24, 2:06 AM
View All Files
Subscribers
bapt
mat

Details

Reviewers
tcberner
capt_redbeard_protonmail.com
Group Reviewers
portmgr
Commits
rP473406: x11/polybar: Fix build against x11/xcb-proto 1.13.
Summary

PR: 228330

  • bring to ~HEAD
  • add DEBUG OPTION

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

rigoletto created this revision.Jun 22 2018, 1:48 PM
Herald added a subscriber: mat. · View Herald TranscriptJun 22 2018, 1:48 PM
Harbormaster completed remote builds in B17541: Diff 44300.Jun 22 2018, 1:48 PM
rigoletto edited the summary of this revision. (Show Details)Jun 22 2018, 1:53 PM
rigoletto updated this revision to Diff 44303.Jun 22 2018, 2:52 PM

Use git tags on GH_TUPLE.

Harbormaster completed remote builds in B17542: Diff 44303.Jun 22 2018, 2:52 PM
rigoletto retitled this revision from x11/polybar: broken. to x11/polybar: Fix build against x11/xcb-proto 1.13..Jun 22 2018, 3:45 PM
rigoletto edited the summary of this revision. (Show Details)
rigoletto added reviewers: capt_redbeard_protonmail.com, portmgr.
rigoletto updated this revision to Diff 44308.Jun 22 2018, 3:49 PM

Had to bring localbase:ldflags back, something related with the i3 module needs some patches. I just fail to understand how it was building perfectly fine a few days ago.

Harbormaster completed remote builds in B17544: Diff 44308.Jun 22 2018, 3:49 PM
tcberner added inline comments.Jun 22 2018, 7:14 PM
x11/polybar/pkg-message
1 ↗(On Diff #44308)

^ I think there is not much gained by this change :D

rigoletto updated this revision to Diff 44322.Jun 22 2018, 8:46 PM
rigoletto added a subscriber: bapt.

That was my 'set textwidth=80' config in neovim. ^^

Also taking maintainer ship, if @bapt decide to take it later it is fine.

Thanks!

Harbormaster completed remote builds in B17552: Diff 44322.Jun 22 2018, 8:46 PM
rigoletto updated this revision to Diff 44351.Jun 23 2018, 4:30 PM

Just bringing to a commit ahead which fix a annoying thing.

Thanks.

Harbormaster completed remote builds in B17568: Diff 44351.Jun 23 2018, 4:30 PM
rigoletto updated this revision to Diff 44352.Jun 23 2018, 5:09 PM

Returning to the previous versioning scheme to avoid PORTEPOCH. The next version should not take too long to come out, however the port needs update because it is currently broken.

Thanks!

Harbormaster completed remote builds in B17569: Diff 44352.Jun 23 2018, 5:09 PM
rigoletto updated this revision to Diff 44353.Jun 23 2018, 5:41 PM

But now it needs GH_TAGNAME.

Harbormaster completed remote builds in B17570: Diff 44353.Jun 23 2018, 5:41 PM
tcberner added inline comments.Jun 23 2018, 6:24 PM
x11/polybar/Makefile
4 ↗(On Diff #44353)

^that looks like its going backwards now 23->22

4 ↗(On Diff #44353)

sorry, I was looking at the Diff-between-Diff view -- ignore me :D

rigoletto added a comment.Jun 23 2018, 6:56 PM

The github commit date for new commits are not really helpfull. The fisrt time I looked on there is '8 hours ago' and later '2 days ago'. :-/

rigoletto updated this revision to Diff 44479.Jun 26 2018, 6:40 PM
rigoletto marked 2 inline comments as done.

Bring back BROKEN_*.

Thanks!

Harbormaster completed remote builds in B17636: Diff 44479.Jun 26 2018, 6:40 PM
rigoletto updated this revision to Diff 44480.Jun 26 2018, 6:42 PM

Fix the day of the commit. Thanks! :)

Harbormaster completed remote builds in B17637: Diff 44480.Jun 26 2018, 6:42 PM
rigoletto updated this revision to Diff 44481.Jun 26 2018, 6:45 PM

Fix distfile.

Harbormaster completed remote builds in B17638: Diff 44481.Jun 26 2018, 6:45 PM
tcberner added a comment.Jun 26 2018, 6:45 PM

^ don't you need to regenerate the distinfo now?

This revision was not accepted when it landed; it landed in state Needs Review.Jun 26 2018, 7:08 PM
Closed by commit rP473406: x11/polybar: Fix build against x11/xcb-proto 1.13. (authored by tcberner). · Explain Why
This revision was automatically updated to reflect the committed changes.
mat added inline comments.Jun 27 2018, 11:11 AM
head/x11/polybar/Makefile
4

This is wrong.

$ git describe --tags 028b141
3.1.0-161-g028b141

and too late to make this one correctly. Please, read this before inventing another version:

https://www.freebsd.org/doc/en/books/porters-handbook/makefile-distfiles.html#makefile-master_sites-github-ex5

Revision Contents
Changeset List

Diff 44485

View Options

head/x11/polybar/Makefile

  • This file was added.
#!/bin/sh
#
# $FreeBSD$
#
# # Set to a list of packages to install.
export VM_EXTRA_PACKAGES="
comms/py-pyserial
emasteUnsubmitted
Done
Inline Actions

should be in alpha order?

emaste: should be in alpha order?
dchAuthorUnsubmitted
Done
Inline Actions

This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as well) which I backported to quarterly last week. It's not yet gotten through the build pipeline:

pkg: No packages available to install matching 'devel/oci-cli' have been found in the repositories

dch: This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as…
converters/base64
emasteUnsubmitted
Done
Inline Actions

I assume the short uncommented list here was just for testing?

emaste: I assume the short uncommented list here was just for testing?
devel/py-babel
devel/py-iso8601
devel/py-oci
devel/py-pbr
devel/py-six
ftp/curl
lang/python
lang/python3
net/cloud-init
net/py-eventlet
net/py-netaddr
net/py-netifaces
net/py-oauth
net/rsync
panicmail
security/ca_root_nss
security/hpenc
security/sudo
sysutils/fd
sysutils/firstboot-freebsd-update
sysutils/firstboot-pkgs
sysutils/htop
sysutils/panicmail
sysutils/tmux
textproc/jq
textproc/ripgrep
www/gurl"
# Should be enough for base image, image can be resized in needed
export VMSIZE=5g
# Set to a list of third-party software to enable in rc.conf(5).
# TODO add cloudinit after finishing testing
export VM_RC_LIST="
cloudinit
firstboot_pkgs
firstboot_freebsd_update
growfs
ntpd
ntpd_sync_on_start
sshd
zfs"
vm_extra_pre_umount() {
cat << EOF >> ${DESTDIR}/etc/rc.conf
dumpdev=AUTO
ifconfig_DEFAULT=SYNCDHCP
sendmail_enable=NONE
EOF
cat << EOF >> ${DESTDIR}/boot/loader.conf
autoboot_delay="5"
beastie_disable="YES"
boot_serial="YES"
loader_logo="none"
# ensure disk devices are found by label not partition
# kern.geom.label.disk_ident.enable="0"
# kern.geom.label.gptid.enable="0"
emasteUnsubmitted
Done
Inline Actions

we definitely don't want to commit with these

emaste: we definitely don't want to commit with these
# storage
cryptodev_load="YES"
opensolaris_load="YES"
xz_load="YES"
zfs_load="YES"
EOF
cat <<EOF >> ${DESTDIR}/etc/ssh/sshd_config
PermitRootLogin prohibit-password
emasteUnsubmitted
Done
Inline Actions

OCI wants PermitRootLogin no (S14 in their requirements)

emaste: OCI wants `PermitRootLogin no` (S14 in their requirements)
PasswordAuthentication no
KbdInteractiveAuthentication no
PermitEmptyPasswords no
UsePAM no
emasteUnsubmitted
Done
Inline Actions

OCI also suggests UsePAM no but we might want to leave PAM enabled; it provides account and session processing for all auth types.

emaste: OCI also suggests `UsePAM no` but we might want to leave PAM enabled; it provides account and…
UseDNS no
EOF
emasteUnsubmitted
Done
Inline Actions

Perhaps pw -R ${DESTDIR} usermod root -w no

But that said, the cloud-init config currently installs the provided ssh key in /root/.ssh/authorized_keys.

emaste: Perhaps `pw -R ${DESTDIR} usermod root -w no` But that said, the cloud-init config currently…
emasteUnsubmitted
Done
Inline Actions

Perhaps:

       # S14 Root user login must be disabled.
       pw -R ${DESTDIR} usermod root -w no
       cat <<-EOF >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg
    disable_root: true
EOF
emaste: Perhaps: ``` # S14 Root user login must be disabled. pw -R ${DESTDIR} usermod…
dchAuthorUnsubmitted
Done
Inline Actions

I think we're ok here with the cloud-init line only.

dch: I think we're ok here with the cloud-init line only.
touch ${DESTDIR}/firstboot
return 0
}
View Options

head/x11/polybar/distinfo

  • This file was added.
#!/bin/sh
#
# $FreeBSD$
#
# # Set to a list of packages to install.
export VM_EXTRA_PACKAGES="
comms/py-pyserial
emasteUnsubmitted
Done
Inline Actions

should be in alpha order?

emaste: should be in alpha order?
dchAuthorUnsubmitted
Done
Inline Actions

This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as well) which I backported to quarterly last week. It's not yet gotten through the build pipeline:

pkg: No packages available to install matching 'devel/oci-cli' have been found in the repositories

dch: This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as…
converters/base64
emasteUnsubmitted
Done
Inline Actions

I assume the short uncommented list here was just for testing?

emaste: I assume the short uncommented list here was just for testing?
devel/py-babel
devel/py-iso8601
devel/py-oci
devel/py-pbr
devel/py-six
ftp/curl
lang/python
lang/python3
net/cloud-init
net/py-eventlet
net/py-netaddr
net/py-netifaces
net/py-oauth
net/rsync
panicmail
security/ca_root_nss
security/hpenc
security/sudo
sysutils/fd
sysutils/firstboot-freebsd-update
sysutils/firstboot-pkgs
sysutils/htop
sysutils/panicmail
sysutils/tmux
textproc/jq
textproc/ripgrep
www/gurl"
# Should be enough for base image, image can be resized in needed
export VMSIZE=5g
# Set to a list of third-party software to enable in rc.conf(5).
# TODO add cloudinit after finishing testing
export VM_RC_LIST="
cloudinit
firstboot_pkgs
firstboot_freebsd_update
growfs
ntpd
ntpd_sync_on_start
sshd
zfs"
vm_extra_pre_umount() {
cat << EOF >> ${DESTDIR}/etc/rc.conf
dumpdev=AUTO
ifconfig_DEFAULT=SYNCDHCP
sendmail_enable=NONE
EOF
cat << EOF >> ${DESTDIR}/boot/loader.conf
autoboot_delay="5"
beastie_disable="YES"
boot_serial="YES"
loader_logo="none"
# ensure disk devices are found by label not partition
# kern.geom.label.disk_ident.enable="0"
# kern.geom.label.gptid.enable="0"
emasteUnsubmitted
Done
Inline Actions

we definitely don't want to commit with these

emaste: we definitely don't want to commit with these
# storage
cryptodev_load="YES"
opensolaris_load="YES"
xz_load="YES"
zfs_load="YES"
EOF
cat <<EOF >> ${DESTDIR}/etc/ssh/sshd_config
PermitRootLogin prohibit-password
emasteUnsubmitted
Done
Inline Actions

OCI wants PermitRootLogin no (S14 in their requirements)

emaste: OCI wants `PermitRootLogin no` (S14 in their requirements)
PasswordAuthentication no
KbdInteractiveAuthentication no
PermitEmptyPasswords no
UsePAM no
emasteUnsubmitted
Done
Inline Actions

OCI also suggests UsePAM no but we might want to leave PAM enabled; it provides account and session processing for all auth types.

emaste: OCI also suggests `UsePAM no` but we might want to leave PAM enabled; it provides account and…
UseDNS no
EOF
emasteUnsubmitted
Done
Inline Actions

Perhaps pw -R ${DESTDIR} usermod root -w no

But that said, the cloud-init config currently installs the provided ssh key in /root/.ssh/authorized_keys.

emaste: Perhaps `pw -R ${DESTDIR} usermod root -w no` But that said, the cloud-init config currently…
emasteUnsubmitted
Done
Inline Actions

Perhaps:

       # S14 Root user login must be disabled.
       pw -R ${DESTDIR} usermod root -w no
       cat <<-EOF >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg
    disable_root: true
EOF
emaste: Perhaps: ``` # S14 Root user login must be disabled. pw -R ${DESTDIR} usermod…
dchAuthorUnsubmitted
Done
Inline Actions

I think we're ok here with the cloud-init line only.

dch: I think we're ok here with the cloud-init line only.
touch ${DESTDIR}/firstboot
return 0
}
View Options

head/x11/polybar/files/patch-cmake_01-core.cmake

  • This file was added.
#!/bin/sh
#
# $FreeBSD$
#
# # Set to a list of packages to install.
export VM_EXTRA_PACKAGES="
comms/py-pyserial
emasteUnsubmitted
Done
Inline Actions

should be in alpha order?

emaste: should be in alpha order?
dchAuthorUnsubmitted
Done
Inline Actions

This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as well) which I backported to quarterly last week. It's not yet gotten through the build pipeline:

pkg: No packages available to install matching 'devel/oci-cli' have been found in the repositories

dch: This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as…
converters/base64
emasteUnsubmitted
Done
Inline Actions

I assume the short uncommented list here was just for testing?

emaste: I assume the short uncommented list here was just for testing?
devel/py-babel
devel/py-iso8601
devel/py-oci
devel/py-pbr
devel/py-six
ftp/curl
lang/python
lang/python3
net/cloud-init
net/py-eventlet
net/py-netaddr
net/py-netifaces
net/py-oauth
net/rsync
panicmail
security/ca_root_nss
security/hpenc
security/sudo
sysutils/fd
sysutils/firstboot-freebsd-update
sysutils/firstboot-pkgs
sysutils/htop
sysutils/panicmail
sysutils/tmux
textproc/jq
textproc/ripgrep
www/gurl"
# Should be enough for base image, image can be resized in needed
export VMSIZE=5g
# Set to a list of third-party software to enable in rc.conf(5).
# TODO add cloudinit after finishing testing
export VM_RC_LIST="
cloudinit
firstboot_pkgs
firstboot_freebsd_update
growfs
ntpd
ntpd_sync_on_start
sshd
zfs"
vm_extra_pre_umount() {
cat << EOF >> ${DESTDIR}/etc/rc.conf
dumpdev=AUTO
ifconfig_DEFAULT=SYNCDHCP
sendmail_enable=NONE
EOF
cat << EOF >> ${DESTDIR}/boot/loader.conf
autoboot_delay="5"
beastie_disable="YES"
boot_serial="YES"
loader_logo="none"
# ensure disk devices are found by label not partition
# kern.geom.label.disk_ident.enable="0"
# kern.geom.label.gptid.enable="0"
emasteUnsubmitted
Done
Inline Actions

we definitely don't want to commit with these

emaste: we definitely don't want to commit with these
# storage
cryptodev_load="YES"
opensolaris_load="YES"
xz_load="YES"
zfs_load="YES"
EOF
cat <<EOF >> ${DESTDIR}/etc/ssh/sshd_config
PermitRootLogin prohibit-password
emasteUnsubmitted
Done
Inline Actions

OCI wants PermitRootLogin no (S14 in their requirements)

emaste: OCI wants `PermitRootLogin no` (S14 in their requirements)
PasswordAuthentication no
KbdInteractiveAuthentication no
PermitEmptyPasswords no
UsePAM no
emasteUnsubmitted
Done
Inline Actions

OCI also suggests UsePAM no but we might want to leave PAM enabled; it provides account and session processing for all auth types.

emaste: OCI also suggests `UsePAM no` but we might want to leave PAM enabled; it provides account and…
UseDNS no
EOF
emasteUnsubmitted
Done
Inline Actions

Perhaps pw -R ${DESTDIR} usermod root -w no

But that said, the cloud-init config currently installs the provided ssh key in /root/.ssh/authorized_keys.

emaste: Perhaps `pw -R ${DESTDIR} usermod root -w no` But that said, the cloud-init config currently…
emasteUnsubmitted
Done
Inline Actions

Perhaps:

       # S14 Root user login must be disabled.
       pw -R ${DESTDIR} usermod root -w no
       cat <<-EOF >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg
    disable_root: true
EOF
emaste: Perhaps: ``` # S14 Root user login must be disabled. pw -R ${DESTDIR} usermod…
dchAuthorUnsubmitted
Done
Inline Actions

I think we're ok here with the cloud-init line only.

dch: I think we're ok here with the cloud-init line only.
touch ${DESTDIR}/firstboot
return 0
}
View Options

head/x11/polybar/files/patch-cmake_03-libs.cmake

  • This file was added.
#!/bin/sh
#
# $FreeBSD$
#
# # Set to a list of packages to install.
export VM_EXTRA_PACKAGES="
comms/py-pyserial
emasteUnsubmitted
Done
Inline Actions

should be in alpha order?

emaste: should be in alpha order?
dchAuthorUnsubmitted
Done
Inline Actions

This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as well) which I backported to quarterly last week. It's not yet gotten through the build pipeline:

pkg: No packages available to install matching 'devel/oci-cli' have been found in the repositories

dch: This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as…
converters/base64
emasteUnsubmitted
Done
Inline Actions

I assume the short uncommented list here was just for testing?

emaste: I assume the short uncommented list here was just for testing?
devel/py-babel
devel/py-iso8601
devel/py-oci
devel/py-pbr
devel/py-six
ftp/curl
lang/python
lang/python3
net/cloud-init
net/py-eventlet
net/py-netaddr
net/py-netifaces
net/py-oauth
net/rsync
panicmail
security/ca_root_nss
security/hpenc
security/sudo
sysutils/fd
sysutils/firstboot-freebsd-update
sysutils/firstboot-pkgs
sysutils/htop
sysutils/panicmail
sysutils/tmux
textproc/jq
textproc/ripgrep
www/gurl"
# Should be enough for base image, image can be resized in needed
export VMSIZE=5g
# Set to a list of third-party software to enable in rc.conf(5).
# TODO add cloudinit after finishing testing
export VM_RC_LIST="
cloudinit
firstboot_pkgs
firstboot_freebsd_update
growfs
ntpd
ntpd_sync_on_start
sshd
zfs"
vm_extra_pre_umount() {
cat << EOF >> ${DESTDIR}/etc/rc.conf
dumpdev=AUTO
ifconfig_DEFAULT=SYNCDHCP
sendmail_enable=NONE
EOF
cat << EOF >> ${DESTDIR}/boot/loader.conf
autoboot_delay="5"
beastie_disable="YES"
boot_serial="YES"
loader_logo="none"
# ensure disk devices are found by label not partition
# kern.geom.label.disk_ident.enable="0"
# kern.geom.label.gptid.enable="0"
emasteUnsubmitted
Done
Inline Actions

we definitely don't want to commit with these

emaste: we definitely don't want to commit with these
# storage
cryptodev_load="YES"
opensolaris_load="YES"
xz_load="YES"
zfs_load="YES"
EOF
cat <<EOF >> ${DESTDIR}/etc/ssh/sshd_config
PermitRootLogin prohibit-password
emasteUnsubmitted
Done
Inline Actions

OCI wants PermitRootLogin no (S14 in their requirements)

emaste: OCI wants `PermitRootLogin no` (S14 in their requirements)
PasswordAuthentication no
KbdInteractiveAuthentication no
PermitEmptyPasswords no
UsePAM no
emasteUnsubmitted
Done
Inline Actions

OCI also suggests UsePAM no but we might want to leave PAM enabled; it provides account and session processing for all auth types.

emaste: OCI also suggests `UsePAM no` but we might want to leave PAM enabled; it provides account and…
UseDNS no
EOF
emasteUnsubmitted
Done
Inline Actions

Perhaps pw -R ${DESTDIR} usermod root -w no

But that said, the cloud-init config currently installs the provided ssh key in /root/.ssh/authorized_keys.

emaste: Perhaps `pw -R ${DESTDIR} usermod root -w no` But that said, the cloud-init config currently…
emasteUnsubmitted
Done
Inline Actions

Perhaps:

       # S14 Root user login must be disabled.
       pw -R ${DESTDIR} usermod root -w no
       cat <<-EOF >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg
    disable_root: true
EOF
emaste: Perhaps: ``` # S14 Root user login must be disabled. pw -R ${DESTDIR} usermod…
dchAuthorUnsubmitted
Done
Inline Actions

I think we're ok here with the cloud-init line only.

dch: I think we're ok here with the cloud-init line only.
touch ${DESTDIR}/firstboot
return 0
}
View Options

head/x11/polybar/files/patch-include_adapters_alsa_generic.hpp

Loading...
View Options

head/x11/polybar/files/patch-man_CMakeLists.txt

Loading...
View Options

head/x11/polybar/pkg-plist

Loading...