diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-03-01 13:59:16 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-04-01 15:53:18 +0000 |
| commit | 74c02f1ec9c9d18845ef12df8d1168974564c667 (patch) | |
| tree | 4bc82c48087a30695d9345c5a6f6e826e1f54bd1 /devel | |
| parent | 7b4d1f0b36f88f7fee1898a9cc10c2acf261a123 (diff) | |
| download | ports-74c02f1ec9c9d18845ef12df8d1168974564c667.tar.gz ports-74c02f1ec9c9d18845ef12df8d1168974564c667.zip | |
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cvsd/files/cvsd.in | 5 | ||||
| -rw-r--r-- | devel/imake/files/patch-imake.c | 39 |
2 files changed, 23 insertions, 21 deletions
diff --git a/devel/cvsd/files/cvsd.in b/devel/cvsd/files/cvsd.in index 42cb68048148..07c1a5ee4b65 100644 --- a/devel/cvsd/files/cvsd.in +++ b/devel/cvsd/files/cvsd.in @@ -19,7 +19,6 @@ stop_postcmd=${name}_poststop cvsd_config() { - osreldate=`sysctl -n kern.osreldate` chrootjail=`sed -n 's/^ *RootJail *\([^ ]*\) *$/\1/p' < $cvsd_config` if [ -z "$chrootjail" ]; then err 1 "RootJail is not specified in $cvsd_config" @@ -34,7 +33,7 @@ cvsd_config() cvsd_prestart() { cvsd_config - if [ $osreldate -gt 500000 ] && [ "$chrootjail" != "none" ]; then + if [ "$chrootjail" != "none" ]; then mount -t devfs devfs $chrootjail/dev devfs -m $chrootjail/dev rule apply hide devfs -m $chrootjail/dev rule apply path null unhide @@ -45,7 +44,7 @@ cvsd_prestart() cvsd_poststop() { - if [ $osreldate -gt 500000 ] && [ "$chrootjail" != "none" ]; then + if [ "$chrootjail" != "none" ]; then umount -t devfs $chrootjail/dev fi } diff --git a/devel/imake/files/patch-imake.c b/devel/imake/files/patch-imake.c index 9b7d0b8fecc0..ed6c3a3570b1 100644 --- a/devel/imake/files/patch-imake.c +++ b/devel/imake/files/patch-imake.c @@ -1,4 +1,4 @@ ---- imake.c.orig 2013-08-17 10:11:50 UTC +--- imake.c.orig 2019-03-16 23:26:24 UTC +++ imake.c @@ -531,6 +531,14 @@ init(void) AddCppArg(p); @@ -15,36 +15,39 @@ if ((p = getenv("IMAKECPP"))) cpp = p; if ((p = getenv("IMAKEMAKE"))) -@@ -1142,29 +1150,17 @@ get_binary_format(FILE *inFile) - int mib[2]; - size_t len; - int osrel = 0; +@@ -1139,34 +1147,7 @@ get_ld_version(FILE *inFile) + static void + get_binary_format(FILE *inFile) + { +- int mib[2]; +- size_t len; +- int osrel = 0; - FILE *objprog = NULL; - int iself = 0; +- int iself = 0; - char buf[10]; - char cmd[PATH_MAX]; - - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELDATE; - len = sizeof(osrel); - sysctl(mib, 2, &osrel, &len, NULL, 0); +- +- mib[0] = CTL_KERN; +- mib[1] = KERN_OSRELDATE; +- len = sizeof(osrel); +- sysctl(mib, 2, &osrel, &len, NULL, 0); - if (CrossCompiling) { - strcpy (cmd, CrossCompileDir); - strcat (cmd, "/"); - strcat (cmd,"objformat"); - } else - strcpy (cmd, "objformat"); - +- - if (osrel >= 300004 && - (objprog = popen(cmd, "r")) != NULL && - fgets(buf, sizeof(buf), objprog) != NULL && - strncmp(buf, "elf", 3) == 0) -+ if (osrel < 300004) -+ iself = 0; -+ else - iself = 1; +- iself = 1; - if (objprog) - pclose(objprog); - - fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO"); +- +- fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO"); ++ fprintf(inFile, "#define DefaultToElfFormat YES\n"); } + #endif + |