From b0d13e87db7ac821e6688cb32078cf7393d3f202 Mon Sep 17 00:00:00 2001 From: "Andrew G. Morgan" Date: Fri, 3 Jul 2020 10:47:42 -0700 Subject: [PATCH] A step closer to modularizing the cap and psx packages. After reading more about Go modules, I now see how ownership of the stable URL path for the packages is required. As such, I'm changing the official package paths to these: "kernel.org/pub/linux/libs/security/libcap/cap" "kernel.org/pub/linux/libs/security/libcap/psx" I have the right permissions to maintain these directories. I will place the libcap/{cap,psx}/index.html files at those locations and then validate that the go getting magic does the right things. Signed-off-by: Andrew G. Morgan --- Make.Rules | 9 +- cap/LICENSE | 385 ++++++++++++++++++++++++++++++++++++++++ cap/cap.go | 26 ++- cap/go.mod | 4 +- cap/index.html | 15 ++ cap/syscalls_cgo.go | 2 +- contrib/golang/Makefile | 6 +- go/Makefile | 30 ++-- go/compare-cap.go | 2 +- go/syscalls.sh | 104 ----------- go/try-launching.go | 2 +- go/web.go | 9 +- psx/go.mod | 4 +- psx/index.html | 15 ++ psx/psx.go | 27 ++- 15 files changed, 480 insertions(+), 160 deletions(-) create mode 100644 cap/LICENSE create mode 100644 cap/index.html delete mode 100755 go/syscalls.sh create mode 100644 psx/index.html diff --git a/Make.Rules b/Make.Rules index 06dc3be..3973d2c 100644 --- a/Make.Rules +++ b/Make.Rules @@ -78,11 +78,12 @@ PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) -GOLANG := $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi) +GO := go +GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi) ifeq ($(GOLANG),yes) -GOROOT := $(shell go env GOROOT) -GOCGO := $(shell if [ "$(shell go env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi) -GOOSARCH := $(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH) +GOROOT := $(shell $(GO) env GOROOT) +GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi) +GOOSARCH := $(shell $(GO) env GOHOSTOS)_$(shell $(GO) env GOHOSTARCH) CGO_CFLAGS := -I$(topdir)/libcap/include CGO_LDFLAGS := -L$(topdir)/libcap CGO_LDFLAGS_ALLOW := -Wl,-?-wrap[=,][^-.@][^,]* diff --git a/cap/LICENSE b/cap/LICENSE new file mode 100644 index 0000000..1c65641 --- /dev/null +++ b/cap/LICENSE @@ -0,0 +1,385 @@ +Unless otherwise *explicitly* stated, the following text describes the +licensed conditions under which the contents of this libcap/cap release +may be used and distributed: + +------------------------------------------------------------------------- +Redistribution and use in source and binary forms of libcap/cap, with +or without modification, are permitted provided that the following +conditions are met: + +1. Redistributions of source code must retain any existing copyright + notice, and this entire permission notice in its entirety, + including the disclaimer of warranties. + +2. Redistributions in binary form must reproduce all prior and current + copyright notices, this list of conditions, and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + +3. The name of any author may not be used to endorse or promote + products derived from this software without their specific prior + written permission. + +ALTERNATIVELY, this product may be distributed under the terms of the +GNU General Public License (v2.0 - see below), in which case the +provisions of the GNU GPL are required INSTEAD OF the above +restrictions. (This clause is necessary due to a potential conflict +between the GNU GPL and the restrictions contained in a BSD-style +copyright.) + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. +------------------------------------------------------------------------- + +------------------------- +Full text of gpl-2.0.txt: +------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/cap/cap.go b/cap/cap.go index 4da93fb..976b302 100644 --- a/cap/cap.go +++ b/cap/cap.go @@ -1,17 +1,25 @@ // Package cap is the Linux capabilities user space API (libcap) // bindings in native Go. // -// For cgo linked binaries, package "libcap/psx" is used to broker the -// POSIX semantics system calls that manipulate process state. +// For cgo linked binaries, behind the scenes, the package +// "kernel.org/pub/linux/libs/security/libcap/psx" is used to broker +// the POSIX semantics system calls that manipulate thread state +// uniformly over the whole process runtime. // -// If the Go runtime syscall interface contains the -// syscall.AllThreadsSyscall() API then this package will use that to -// invoke capability setting system calls for pure Go binaries. To -// force this behavior use the CGO_ENABLED=0 environment variable. +// If the Go runtime syscall interface contains the linux variant +// syscall.AllThreadsSyscall() API (it is not in go1.15beta1 for +// example) then this package can use that to invoke capability +// setting system calls for pure Go binaries. To force this behavior +// use the CGO_ENABLED=0 environment variable and, for now, a build +// tag: // -// If syscall.AllThreadsSyscall() is not present, the "libcap/cap" -// package will failover to using "libcap/psx". -package cap +// CGO_ENABLED=0 go build -tags allthreadssyscall ... +// +// If syscall.AllThreadsSyscall() is not present, the ".../libcap/cap" +// package will failover to using ".../libcap/psx". +// +// Copyright (c) 2019,20 Andrew G. Morgan +package cap // import "kernel.org/pub/linux/libs/security/libcap/cap" import ( "errors" diff --git a/cap/go.mod b/cap/go.mod index 2fbd393..40f845a 100644 --- a/cap/go.mod +++ b/cap/go.mod @@ -1,3 +1,3 @@ -module git.kernel.org/libs/libcap/cap +module kernel.org/pub/linux/libs/security/libcap/cap -go 1.14 +go 1.11 diff --git a/cap/index.html b/cap/index.html new file mode 100644 index 0000000..cc3a488 --- /dev/null +++ b/cap/index.html @@ -0,0 +1,15 @@ + + + + + + + + + Redirecting in 10 seconds to + the Fully + Capable project page: the home of the + "kernel.org/pub/linux/libs/security/libcap/psx" and + "kernel.org/pub/linux/libs/security/libcap/cap" Go packages. + + diff --git a/cap/syscalls_cgo.go b/cap/syscalls_cgo.go index a69b3f1..0dc6a0c 100644 --- a/cap/syscalls_cgo.go +++ b/cap/syscalls_cgo.go @@ -5,7 +5,7 @@ package cap import ( "syscall" - "git.kernel.org/libs/libcap/psx" + "kernel.org/pub/linux/libs/security/libcap/psx" ) // multisc provides syscalls overridable for testing purposes that diff --git a/contrib/golang/Makefile b/contrib/golang/Makefile index 04585e7..4c497cf 100644 --- a/contrib/golang/Makefile +++ b/contrib/golang/Makefile @@ -1,6 +1,8 @@ +GO := go + all: posix.go posix-cgo.go - CGO_ENABLED=0 go build posix.go - go build posix-cgo.go + CGO_ENABLED=0 $(GO) build posix.go + $(GO) build posix-cgo.go posix.go: ptest.go posix.stub_go Makefile sed -e '/\/\/ main_here/ r posix.stub_go' ptest.go > $@ diff --git a/go/Makefile b/go/Makefile index 3bee774..e8008d0 100644 --- a/go/Makefile +++ b/go/Makefile @@ -2,16 +2,16 @@ # # Note, we use symlinks to construct a GOPATH friendly src tree. The # packages themselves are intended to be (ultimately) found via proxy -# as "git.kernel.org/lib/libcap/cap" and -# "git.kernel.org/lib/libcap/psx". However, to validate their use on -# these paths, we fake such a structure in the build tree with -# symlinks. +# as "kernel.org/pub/linux/libs/security/libcap/cap" and +# "kernel.org/pub/linux/libs/security/libcap/psx". However, to +# validate their use on these paths, we fake such a structure in the +# build tree with symlinks. topdir=$(realpath ..) include $(topdir)/Make.Rules GOPATH=$(realpath .) -IMPORTDIR=git.kernel.org/libs/libcap +IMPORTDIR=kernel.org/pub/linux/libs/security/libcap PKGDIR=pkg/$(GOOSARCH)/$(IMPORTDIR) PSXGOPACKAGE=$(PKGDIR)/psx.a CAPGOPACKAGE=$(PKGDIR)/cap.a @@ -38,23 +38,23 @@ $(topdir)/libcap/cap_names.h: $(DEPS) make -C $(topdir)/libcap all good-names.go: $(topdir)/libcap/cap_names.h src/$(IMPORTDIR)/cap mknames.go - go run mknames.go --header=$< | gofmt > $@ || rm -f $@ + $(GO) run mknames.go --header=$< | gofmt > $@ || rm -f $@ diff -u ../cap/names.go $@ $(PSXGOPACKAGE): src/$(IMPORTDIR)/psx ../psx/*.go $(DEPS) mkdir -p pkg - CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH="$(GOPATH)" go install $(IMPORTDIR)/psx + CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH="$(GOPATH)" $(GO) install $(IMPORTDIR)/psx $(CAPGOPACKAGE): src/$(IMPORTDIR)/cap ../cap/*.go good-names.go $(PSXGOPACKAGE) - CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) go install $(IMPORTDIR)/cap + CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) $(GO) install $(IMPORTDIR)/cap # Compiles something with this package to compare it to libcap. This # tests more when run under sudotest (see ../progs/quicktest.sh for that). compare-cap: compare-cap.go $(CAPGOPACKAGE) - CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) go build $< + CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) $(GO) build $< web: web.go $(CAPGOPACKAGE) - CGO_ENABLED="$(CGO_REQUIRED)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) go build $(GOBUILDTAG) $< + CGO_ENABLED="$(CGO_REQUIRED)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) $(GO) build $(GOBUILDTAG) $< ifeq ($(RAISE_GO_FILECAP),yes) make -C ../progs setcap sudo ../progs/setcap cap_setpcap,cap_net_bind_service=p web @@ -62,17 +62,17 @@ ifeq ($(RAISE_GO_FILECAP),yes) endif ok: ok.go - CGO_ENABLED=0 GOPATH=$(GOPATH) go build $< + CGO_ENABLED=0 GOPATH=$(GOPATH) $(GO) build $< try-launching: try-launching.go $(CAPGOPACKAGE) ok - CGO_ENABLED="$(CGO_REQUIRED)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) go build $(GOBUILDTAG) $< + CGO_ENABLED="$(CGO_REQUIRED)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) $(GO) build $(GOBUILDTAG) $< ifeq ($(CGO_REQUIRED),0) - CGO_ENABLED="1" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) go build -o $@-cgo $< + CGO_ENABLED="1" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) $(GO) build -o $@-cgo $< endif test: all ../progs/capsh - CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH="$(GOPATH)" go test $(IMPORTDIR)/psx - CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) go test $(IMPORTDIR)/cap + CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH="$(GOPATH)" $(GO) test $(IMPORTDIR)/psx + CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPATH=$(GOPATH) $(GO) test $(IMPORTDIR)/cap LD_LIBRARY_PATH=../libcap ./compare-cap ./try-launching ifeq ($(CGO_REQUIRED),0) diff --git a/go/compare-cap.go b/go/compare-cap.go index ad131a2..c874ad8 100644 --- a/go/compare-cap.go +++ b/go/compare-cap.go @@ -8,7 +8,7 @@ import ( "syscall" "unsafe" - "git.kernel.org/libs/libcap/cap" + "kernel.org/pub/linux/libs/security/libcap/cap" ) // #include diff --git a/go/syscalls.sh b/go/syscalls.sh deleted file mode 100755 index c707507..0000000 --- a/go/syscalls.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash - -dir="$1" -if [[ -z "$dir" ]]; then - echo need an argument directory - exit 1 -fi - -# We use one or the other syscalls.go file based on whether or not the -# Go runtime include syscall.AllThreadsSyscall or not. -if [ -z "$(go doc syscall 2>/dev/null|grep AllThreadsSyscall)" ]; then - rm -f "${dir}/syscalls_cgo.go" - cat > "${dir}/syscalls.go" < "${dir}/syscalls.go" < "${dir}/syscalls_cgo.go" < + + + + + + + + Redirecting in 10 seconds to + the Fully + Capable project page: the home of the + "kernel.org/pub/linux/libs/security/libcap/psx" and + "kernel.org/pub/linux/libs/security/libcap/cap" Go packages. + + diff --git a/psx/psx.go b/psx/psx.go index d10dec0..8016f49 100644 --- a/psx/psx.go +++ b/psx/psx.go @@ -17,21 +17,22 @@ // https://sites.google.com/site/fullycapable // // Without a full system install of the libpsx C library and header, -// you can download the latest libcap sources, type make and use Go -// environment variable overrides to include and link against the -// libpsx.a static library it builds. Specifically, these: +// you can download the latest libcap sources (see above site) and +// type make to build them. Use the Go environment variable overrides +// to include and link against the libpsx.a static library it +// builds. Specifically, these: // -// export CGO_CFLAGS="-I ...path-to.../libcap/include" -// export CGO_LDFLAGS="-L ...path-to.../libcap" +// export CGO_CFLAGS="-I /...your-path-to.../libcap/include" +// export CGO_LDFLAGS="-L /...your-path-to.../libcap" // -// The second may be required to be able to link this package using -// the Go compiler. In order to do what it needs to, this package -// employs some unusual linking flags. Specifically, for Go releases -// prior to those that include this patch: +// The second, if your Go compiler is pre-go1.15, may be required to +// be able to link this package. In order to do what it needs to, this +// package employs some unusual linking flags. Specifically, for Go +// releases prior to those that include this patch: // // https://go-review.googlesource.com/c/go/+/236139/ // -// As of the time of writing, that is all releases earlier than +// As of the time of writing, that is all release tags prior to // go1.15beta1 . // // The workaround is to build using the CGO_LDFLAGS_ALLOW override as @@ -39,12 +40,8 @@ // // export CGO_LDFLAGS_ALLOW="-Wl,-?-wrap[=,][^-.@][^,]*" // -// A future version of this package may simply require go1.15 to build -// it, or exclude the versions of Go that introduced CGO_LDFLAGS_ALLOW -// but didn't include the above patch. -// // Copyright (c) 2019,20 Andrew G. Morgan -package psx +package psx // import "kernel.org/pub/linux/libs/security/libcap/psx" import ( "syscall"